From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9AF8C4338F for ; Sun, 8 Aug 2021 18:22:51 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3832860EBB for ; Sun, 8 Aug 2021 18:22:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3832860EBB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 286D382D5E; Sun, 8 Aug 2021 20:21:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="X1WTSiOh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 99CF082E98; Sun, 8 Aug 2021 20:21:21 +0200 (CEST) Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2C8F482CE6 for ; Sun, 8 Aug 2021 20:20:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oi1-x22a.google.com with SMTP id y18so20352610oiv.3 for ; Sun, 08 Aug 2021 11:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EbXzLlMjk+3kbfoj4noq6P+NTYbNRmn5BqxDElMADwg=; b=X1WTSiOhbxMWHpTBLOtxLkF2bFlDqh+LjaOXOhKKvVkjDBQAdeZcYqD9/w8i+IOdbQ bwuOXkZufa0L8vfFd+WKRRdH/eRi/FpXe4iM+kFy9al4yvae4R1GVQt8feabstO9gD2p WOV8VzQ7UySqmerwQIaDJ9h+bFhhKhSEv65nY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EbXzLlMjk+3kbfoj4noq6P+NTYbNRmn5BqxDElMADwg=; b=jUGPeK+mD2vHlITZUvhsZhFjSSLdsFagWTjy2FuRvxoC+JoshNWHzp9q9lxHFhoi3y s3sPoEXwl+Y/odOL9JFmiM4gGSGOv07rjxIxjQeVLHeUKPU8Y7uWEC8dNmFG7DiOhZ1K Pp2ciVb3IkdWig6qxjBcnxMSOzE7JIB0nVXPPa5Xq4a64S8jInWU1JLOvAXxH3SOeDCF tT1wqIJuy8PuZ/YxuNissA4bB+7B073OSOMqlmDFZiO9D6o+IV7xJ+FC37QwgiLsZ4FZ Do9dMIklpGl5VcvUwb7IX9wczxOQXOqJPpJ1ZK0y240xqbWawCCjEGWG8k9X+XWBLySE ONXQ== X-Gm-Message-State: AOAM533s+X+WfAmx1+d5d5ufi6qhfxREqPgad2GcwVyiRFuryAJ0BbyT xN80/BAGPp7lTGJy/btpv8JEZe3fGEAwCTtw X-Google-Smtp-Source: ABdhPJzQhRxjad8Sy1kRRcJdlzgXRT4q1yyxAh6wTIctrxCzp89c2XhMHXcH8tFpGCVCPzQS6doVOQ== X-Received: by 2002:aca:b656:: with SMTP id g83mr4898665oif.84.1628446850593; Sun, 08 Aug 2021 11:20:50 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id bc42sm2257147oob.39.2021.08.08.11.20.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Aug 2021 11:20:50 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 09/23] sata: Rename SATA_SUPPORT to SATA Date: Sun, 8 Aug 2021 12:20:17 -0600 Message-Id: <20210808182031.3747270-10-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog In-Reply-To: <20210808182031.3747270-1-sjg@chromium.org> References: <20210808182031.3747270-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Rename this options so that CONFIG_IS_ENABLED can be used with it. Signed-off-by: Simon Glass --- arch/arm/mach-mvebu/Kconfig | 2 +- arch/arm/mach-mvebu/spl.c | 10 +++++----- arch/arm/mach-zynqmp/spl.c | 2 +- arch/powerpc/cpu/mpc83xx/Kconfig | 4 ++-- common/spl/Kconfig | 6 +++--- common/spl/Makefile | 2 +- drivers/Makefile | 2 +- drivers/scsi/Makefile | 2 +- include/configs/imx6_spl.h | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 345faf93581..a2c29a4b29b 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -272,7 +272,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC config MVEBU_SPL_BOOT_DEVICE_SATA bool "SATA" - imply SPL_SATA_SUPPORT + imply SPL_SATA imply SPL_LIBDISK_SUPPORT select SPL_BOOTROM_SUPPORT diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 65ee79c0300..effcf07f843 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -18,7 +18,7 @@ #include #if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) || defined(CONFIG_SPL_MMC) || \ - defined(CONFIG_SPL_SATA_SUPPORT) + defined(CONFIG_SPL_SATA) /* * When loading U-Boot via SPL from SPI NOR, CONFIG_SYS_SPI_U_BOOT_OFFS must @@ -57,7 +57,7 @@ * stored at sector 1. Therefore CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR must be * set to 1. Otherwise U-Boot SPL would not be able to load U-Boot proper. */ -#ifdef CONFIG_SPL_SATA_SUPPORT +#ifdef CONFIG_SPL_SATA #if !defined(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR) || !defined(CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR) || CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR != 1 #error CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR must be set to 1 #endif @@ -122,7 +122,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image, #ifdef CONFIG_SPL_SPI_FLASH_SUPPORT mhdr->blockid != IBR_HDR_SPI_ID && #endif -#ifdef CONFIG_SPL_SATA_SUPPORT +#ifdef CONFIG_SPL_SATA mhdr->blockid != IBR_HDR_SATA_ID && #endif #ifdef CONFIG_SPL_MMC @@ -136,7 +136,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image, spl_image->offset = mhdr->srcaddr; -#ifdef CONFIG_SPL_SATA_SUPPORT +#ifdef CONFIG_SPL_SATA /* * For SATA srcaddr is specified in number of sectors. * The main header is must be stored at sector number 1. @@ -266,7 +266,7 @@ u32 spl_boot_device(void) case BOOT_DEVICE_MMC1: return BOOT_DEVICE_MMC1; #endif -#ifdef CONFIG_SPL_SATA_SUPPORT +#ifdef CONFIG_SPL_SATA case BOOT_FROM_SATA: return BOOT_FROM_SATA; #endif diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index c3a99041b07..6b836cbff2d 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -100,7 +100,7 @@ u32 spl_boot_device(void) case USB_MODE: return BOOT_DEVICE_DFU; #endif -#ifdef CONFIG_SPL_SATA_SUPPORT +#ifdef CONFIG_SPL_SATA case SW_SATA_MODE: return BOOT_DEVICE_SATA; #endif diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 083febe5bb3..2a5e66b7941 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -119,7 +119,7 @@ config MPC83XX_PCIE2_SUPPORT config MPC83XX_SDHC_SUPPORT bool -config MPC83XX_SATA_SUPPORT +config MPC83XX_SATA bool config MPC83XX_SECOND_I2C @@ -193,7 +193,7 @@ config ARCH_MPC837X select MPC83XX_PCIE1_SUPPORT select MPC83XX_PCIE2_SUPPORT select MPC83XX_SDHC_SUPPORT - select MPC83XX_SATA_SUPPORT + select MPC83XX_SATA select MPC83XX_LDP_PIN select MPC83XX_SECOND_I2C select FSL_ELBC diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f9abdca275b..1ce74d07618 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -196,7 +196,7 @@ config SPL_BOOTCOUNT_LIMIT config SPL_RAW_IMAGE_SUPPORT bool "Support SPL loading and booting of RAW images" - default n if (ARCH_MX6 && (SPL_MMC || SPL_SATA_SUPPORT)) + default n if (ARCH_MX6 && (SPL_MMC || SPL_SATA)) default y if !TI_SECURE_DEVICE help SPL will support loading and booting a RAW image when this option @@ -1080,7 +1080,7 @@ config SPL_RTC needed. This enables the drivers in drivers/rtc as part of an SPL build. -config SPL_SATA_SUPPORT +config SPL_SATA bool "Support loading from SATA" help Enable support for SATA (Serial AT attachment) in SPL. This allows @@ -1092,7 +1092,7 @@ config SPL_SATA_SUPPORT config SPL_SATA_RAW_U_BOOT_USE_SECTOR bool "SATA raw mode: by sector" - depends on SPL_SATA_SUPPORT + depends on SPL_SATA default y if ARCH_MVEBU help Use sector number for specifying U-Boot location on SATA disk in diff --git a/common/spl/Makefile b/common/spl/Makefile index 29ac624f9a0..40107e39bde 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -27,7 +27,7 @@ obj-$(CONFIG_$(SPL_TPL_)OPENSBI) += spl_opensbi.o obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o -obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o +obj-$(CONFIG_$(SPL_TPL_)SATA) += spl_sata.o obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o obj-$(CONFIG_$(SPL_TPL_)RAM_SUPPORT) += spl_ram.o diff --git a/drivers/Makefile b/drivers/Makefile index ad2ce1e1218..3709cf781d8 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -59,7 +59,7 @@ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/ obj-$(CONFIG_SPL_WATCHDOG) += watchdog/ obj-$(CONFIG_SPL_USB_HOST) += usb/host/ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ -obj-$(CONFIG_SPL_SATA_SUPPORT) += ata/ scsi/ +obj-$(CONFIG_SPL_SATA) += ata/ scsi/ obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/ obj-$(CONFIG_SPL_THERMAL) += thermal/ diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 6fc5f4a9f9c..e9f848636c6 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -9,7 +9,7 @@ obj-$(CONFIG_SCSI) += scsi.o endif ifdef CONFIG_SPL_BUILD -ifdef CONFIG_SPL_SATA_SUPPORT +ifdef CONFIG_SPL_SATA obj-$(CONFIG_DM_SCSI) += scsi-uclass.o obj-$(CONFIG_SCSI) += scsi.o endif diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index b5d50333dda..234aacb3b91 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -59,7 +59,7 @@ #endif /* SATA support */ -#if defined(CONFIG_SPL_SATA_SUPPORT) +#if defined(CONFIG_SPL_SATA) #define CONFIG_SPL_SATA_BOOT_DEVICE 0 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1 #endif -- 2.32.0.605.g8dce9f2422-goog