From patchwork Thu Aug 18 15:41:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 74181 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp414818qga; Thu, 18 Aug 2016 08:44:37 -0700 (PDT) X-Received: by 10.194.118.38 with SMTP id kj6mr2593445wjb.181.1471535077224; Thu, 18 Aug 2016 08:44:37 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id t129si182158wme.25.2016.08.18.08.44.36; Thu, 18 Aug 2016 08:44:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 32306A75C6; Thu, 18 Aug 2016 17:43:56 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lk8proRIT2vB; Thu, 18 Aug 2016 17:43:56 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6CD37A75CE; Thu, 18 Aug 2016 17:43:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 92FBF4B9B1 for ; Thu, 18 Aug 2016 17:42:41 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TJWcubrGv3BP for ; Thu, 18 Aug 2016 17:42:41 +0200 (CEST) Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by theia.denx.de (Postfix) with ESMTPS id 59AC34B99D for ; Thu, 18 Aug 2016 17:42:39 +0200 (CEST) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id u7IFgUX1013581; Thu, 18 Aug 2016 10:42:30 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u7IFgT7G004630; Thu, 18 Aug 2016 10:42:29 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Thu, 18 Aug 2016 10:42:28 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u7IFgSdR018344; Thu, 18 Aug 2016 10:42:28 -0500 Received: from localhost (uda0226330.am.dhcp.ti.com [128.247.83.252]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id u7IFgQ306910; Thu, 18 Aug 2016 10:42:26 -0500 (CDT) From: "Andrew F. Davis" To: Lokesh Vutla , Heiko Schocher , Gilles Gameiro , Daniel Allred , Madan Srinivas , Simon Glass , Enric Balletbo i Serra , Hannes Schmelzer , Tom Rini , Tero Kristo Date: Thu, 18 Aug 2016 10:41:44 -0500 Message-ID: <20160818154146.16788-12-afd@ti.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160818154146.16788-1-afd@ti.com> References: <20160818154146.16788-1-afd@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 11/13] omap: Use SD_BOOT in place of EMMC_BOOT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" The config option EMMC_BOOT is used in several OMAP based platforms with the same meaning as the existing SD_BOOT. Convert all uses, no functional changes. Signed-off-by: Andrew F. Davis --- board/ti/am335x/mux.c | 4 ++-- configs/am335x_boneblack_defconfig | 2 +- configs/am335x_boneblack_vboot_defconfig | 3 ++- configs/am335x_sl50_defconfig | 2 +- configs/brppt1_mmc_defconfig | 3 ++- configs/brppt1_spi_defconfig | 3 ++- include/configs/am335x_evm.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/bav335x.h | 2 +- include/configs/brppt1.h | 6 +++--- 10 files changed, 16 insertions(+), 13 deletions(-) -- 2.9.2 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 8afa5f9..2d580d2 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -383,9 +383,9 @@ void enable_board_pin_mux(void) /* Beaglebone LT pinmux */ configure_module_pin_mux(mii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); -#if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT) +#if defined(CONFIG_NAND) && defined(CONFIG_SD_BOOT) configure_module_pin_mux(nand_pin_mux); -#elif defined(CONFIG_NOR) && defined(CONFIG_EMMC_BOOT) +#elif defined(CONFIG_NOR) && defined(CONFIG_SD_BOOT) configure_module_pin_mux(bone_norcape_pin_mux); #else configure_module_pin_mux(mmc1_pin_mux); diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 30ff029..2fc46ae 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -5,7 +5,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +CONFIG_SD_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 7ff0c87..57b2606 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -8,7 +8,8 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT" +CONFIG_SYS_EXTRA_OPTIONS="ENABLE_VBOOT" +CONFIG_SD_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 01c1eeb..cdb94bb 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +CONFIG_SD_BOOT=y CONFIG_HUSH_PARSER=y # CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index cf2800b..2a8b4c4 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -2,7 +2,8 @@ CONFIG_ARM=y CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" +CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=-2 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index fee9973..47636c7 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -2,7 +2,8 @@ CONFIG_ARM=y CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT" +CONFIG_SD_BOOT=y CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=-2 CONFIG_HUSH_PARSER=y diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2b65890..743ecb5 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -416,7 +416,7 @@ "512k(u-boot),128k(u-boot-env1)," \ "128k(u-boot-env2),3464k(kernel)," \ "-(rootfs)" -#elif defined(CONFIG_EMMC_BOOT) +#elif defined(CONFIG_SD_BOOT) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SYS_MMC_ENV_DEV 1 diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 8454872..2854536 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -114,7 +114,7 @@ #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" #endif -#if defined(CONFIG_EMMC_BOOT) +#if defined(CONFIG_SD_BOOT) #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SPL_ENV_SUPPORT diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index e391c91..8743db4 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -548,7 +548,7 @@ DEFAULT_LINUX_BOOT_ENV \ "512k(u-boot),128k(u-boot-env1)," \ "128k(u-boot-env2),3464k(kernel)," \ "-(rootfs)" -#elif defined(CONFIG_EMMC_BOOT) +#elif defined(CONFIG_SD_BOOT) #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SPL_ENV_SUPPORT diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 6a239b5..69a1adc 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -50,7 +50,7 @@ #define CONFIG_MACH_TYPE 0xFFFFFFFF /* TODO: check with kernel*/ /* MMC/SD IP block */ -#if defined(CONFIG_EMMC_BOOT) +#if defined(CONFIG_SD_BOOT) #define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_OMAP_HSMMC @@ -59,7 +59,7 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /*addr. 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ #define CONFIG_SPL_MMC_SUPPORT -#endif /* CONFIG_EMMC_BOOT */ +#endif /* CONFIG_SD_BOOT */ /* * When we have SPI or NAND flash we expect to be making use of mtdparts, @@ -269,7 +269,7 @@ MMCARGS #define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */ #define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */ -#elif defined(CONFIG_EMMC_BOOT) +#elif defined(CONFIG_SD_BOOT) #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0