From: Andrew F. Davis <afd@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 11/13] omap: Use SD_BOOT in place of EMMC_BOOT
Date: Thu, 18 Aug 2016 10:41:44 -0500 [thread overview]
Message-ID: <20160818154146.16788-12-afd@ti.com> (raw)
In-Reply-To: <20160818154146.16788-1-afd@ti.com>
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 <afd@ti.com>
---
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(-)
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
--
2.9.2
next prev parent reply other threads:[~2016-08-18 15:41 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 15:41 [U-Boot] [PATCH 00/13] Cleanups to allow secure boot on AM33xx devices Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 01/13] spl: Kconfig: Add SPL_<media>_SUPPORT as Kconfig option Andrew F. Davis
2016-08-19 6:27 ` Heiko Schocher
2016-08-19 19:30 ` Andrew F. Davis
2016-08-19 19:54 ` Tom Rini
2016-08-21 18:35 ` Andrew F. Davis
2016-08-21 18:50 ` Tom Rini
2016-08-21 19:12 ` Andrew F. Davis
2016-08-21 19:33 ` Tom Rini
2016-08-22 14:06 ` Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 02/13] spl: Kconfig: Add SPL_<media>_BOOT " Andrew F. Davis
2016-08-19 4:10 ` Lokesh Vutla
2016-08-19 15:29 ` Andrew F. Davis
2016-08-22 4:23 ` Lokesh Vutla
2016-08-22 12:25 ` Tom Rini
2016-08-22 12:55 ` Simon Glass
2016-08-23 6:15 ` Masahiro Yamada
2016-08-18 15:41 ` [U-Boot] [PATCH 03/13] spl: Kconfig: Add CONFIG_SPL_TEXT_BASE " Andrew F. Davis
2016-08-19 4:12 ` Lokesh Vutla
2016-08-19 12:22 ` Simon Glass
2016-08-18 15:41 ` [U-Boot] [PATCH 04/13] config: am335x_evm: Move CONFIG_SPL_YMODEM_SUPPORT to Kconfig Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 05/13] config: am43xx_evm: " Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 06/13] Kconfig: Separate AM33XX SOC config from target board config Andrew F. Davis
2016-08-19 4:15 ` Lokesh Vutla
2016-08-22 15:26 ` Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 07/13] am33xx: config.mk: Add support for additional secure boot image types Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 08/13] am33xx: config.mk: Fix option used to enable SPI SPL image type Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 09/13] doc: Update info on using AM33xx secure devices from TI Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 10/13] ti: omap-common: Allow AM33xx devices to be built securely Andrew F. Davis
2016-08-18 15:41 ` Andrew F. Davis [this message]
2016-08-18 15:41 ` [U-Boot] [PATCH 12/13] config: Remove usage of CONFIG_STORAGE_EMMC Andrew F. Davis
2016-08-18 15:41 ` [U-Boot] [PATCH 13/13] board: am33xx-hs: spl: Allow post-processing of FIT image on AM33xx Andrew F. Davis
2016-08-19 6:10 ` [U-Boot] [PATCH 00/13] Cleanups to allow secure boot on AM33xx devices Lokesh Vutla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160818154146.16788-12-afd@ti.com \
--to=afd@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.