From d126e016493dc84a87db4ce87db4c5a94ee29e9a Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Mon, 18 May 2015 14:08:23 +0200 Subject: autoboot.c: Move config options to Kconfig This patch moves the following config options to Kconfig: CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_PROMPT CONFIG_AUTOBOOT_DELAY_STR CONFIG_AUTOBOOT_STOP_STR AUTOBOOT_KEYED_CTRLC Signed-off-by: Stefan Roese Reviewed-by: Simon Glass [trini: Drop ip04 and pm9263 configs/ additions, those boards previously set CONFIG_AUTOBOOT_PROMPT but never used it, re-run savedefconfig over all boards that did change. Make digsy_mtc_* string include seconds to match others and not warn. ] Signed-off-by: Tom Rini Cc: Masahiro Yamada --- configs/atngw100mkii_defconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'configs/atngw100mkii_defconfig') diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig index 6caf691..2d1845f 100644 --- a/configs/atngw100mkii_defconfig +++ b/configs/atngw100mkii_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_ATNGW100MKII=y CONFIG_CMD_NET=y +CONFIG_TARGET_ATNGW100MKII=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " -- cgit v1.1 From c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Mon, 22 Jun 2015 16:15:29 -0500 Subject: Move default y configs out of arch/board Kconfig Some archs/boards specify their own default by pre-defining the config which causes the Kconfig system to mix up the order of the configs in the defconfigs... This will cause merge pain if allowed to proliferate. Remove the configs that behave this way from the archs. A few configs still remain, but that is because they only exist as defaults and do not have a proper Kconfig entry. Those appear to be: SPIFLASH DISPLAY_BOARDINFO Signed-off-by: Joe Hershberger [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates, drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM] Signed-off-by: Tom Rini --- configs/atngw100mkii_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configs/atngw100mkii_defconfig') diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig index 2d1845f..b4014df 100644 --- a/configs/atngw100mkii_defconfig +++ b/configs/atngw100mkii_defconfig @@ -1,7 +1,8 @@ CONFIG_AVR32=y -CONFIG_CMD_NET=y CONFIG_TARGET_ATNGW100MKII=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_NET=y +CONFIG_SPI_FLASH=y -- cgit v1.1 From ef0f2f57524ec85fb9058a23298f2c4995e0d950 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Mon, 22 Jun 2015 16:15:30 -0500 Subject: Move defaults from config_cmd_default.h to Kconfig This sets the default commands Kconfig to match include/config_cmd_default.h commands in the common/Kconfig and removes them from include/configs. Signed-off-by: Joe Hershberger [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates] Signed-off-by: Tom Rini --- configs/atngw100mkii_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configs/atngw100mkii_defconfig') diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig index b4014df..b4d8d1c 100644 --- a/configs/atngw100mkii_defconfig +++ b/configs/atngw100mkii_defconfig @@ -4,5 +4,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_CMD_NET=y +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -- cgit v1.1