diff options
author | Tom Rini <trini@konsulko.com> | 2016-11-29 09:14:56 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-12-03 13:21:23 -0500 |
commit | 4880b026ec9e432761add36d80cfcc8b430b5405 (patch) | |
tree | f8680c03fce55e40ee96715de7a8fc8fa5daf8fa /include | |
parent | 1b597ada36a005f9800e2068bb745b9edccd04ba (diff) | |
download | u-boot-imx-4880b026ec9e432761add36d80cfcc8b430b5405.zip u-boot-imx-4880b026ec9e432761add36d80cfcc8b430b5405.tar.gz u-boot-imx-4880b026ec9e432761add36d80cfcc8b430b5405.tar.bz2 |
cmd: Convert CMD_BOOTMENU
Also convert MENU while we're in here.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/config_distro_defaults.h | 1 | ||||
-rw-r--r-- | include/config_fallbacks.h | 1 | ||||
-rw-r--r-- | include/configs/hikey.h | 1 | ||||
-rw-r--r-- | include/configs/ls1043a_common.h | 1 | ||||
-rw-r--r-- | include/configs/nokia_rx51.h | 2 | ||||
-rw-r--r-- | include/configs/thunderx_88xx.h | 3 | ||||
-rw-r--r-- | include/configs/vexpress_aemv8a.h | 2 | ||||
-rw-r--r-- | include/configs/xilinx_zynqmp.h | 1 |
8 files changed, 0 insertions, 12 deletions
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index b5efab5..2e24b17 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -25,7 +25,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP -#define CONFIG_MENU #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_ISO_PARTITION diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 2ad54b7..3800932 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -96,7 +96,6 @@ #ifndef CONFIG_CMDLINE #undef CONFIG_CMDLINE_EDITING #undef CONFIG_SYS_LONGHELP -#undef CONFIG_MENU #endif #endif /* __CONFIG_FALLBACKS_H */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 39faf80..7a03d0f 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -80,7 +80,6 @@ #define CONFIG_FS_EXT4 /* Command line configuration */ -#define CONFIG_MENU #define CONFIG_CMD_UNZIP #define CONFIG_CMD_ENV diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 7a407aa..9b20c56 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -145,7 +145,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV -#define CONFIG_MENU #define CONFIG_CMD_PXE /* MMC */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 4d5265f..ce74322 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -118,7 +118,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -#define CONFIG_CMD_BOOTMENU /* ANSI terminal Boot Menu */ #define CONFIG_CMD_CLEAR /* ANSI terminal clear screen command */ #ifdef ONENAND_SUPPORT @@ -364,7 +363,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_MENU #define CONFIG_MENU_SHOW /* diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 4387082..a546db2 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -49,9 +49,6 @@ #define CONFIG_BAUDRATE 115200 -/* Command line configuration */ -#define CONFIG_MENU - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 48834c2..733f011 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -125,8 +125,6 @@ #define CONFIG_PL011_CLOCK 24000000 #endif -/* Command line configuration */ -#define CONFIG_MENU /*#define CONFIG_MENU_SHOW*/ #define CONFIG_CMD_UNZIP #define CONFIG_CMD_PXE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 7452e92..d0b6095 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -82,7 +82,6 @@ /* PXE */ #define CONFIG_CMD_PXE -#define CONFIG_MENU #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_MMC |