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/maxbcm_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/maxbcm_defconfig') diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index 23af99b986..b60faa1e5b 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_TARGET_MAXBCM=y CONFIG_SPL=y CONFIG_CMD_NET=y +CONFIG_SPI_FLASH=y -- cgit v1.2.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/maxbcm_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configs/maxbcm_defconfig') diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index b60faa1e5b..c5b3b67024 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -1,5 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_MAXBCM=y CONFIG_SPL=y -CONFIG_CMD_NET=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -- cgit v1.2.1 From 9cb528de4800f350e819000d93bfe836042528a2 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Mon, 29 Jun 2015 22:36:18 +0530 Subject: defconfig: Move CONFIG_SPI_FLASH_BAR from configs This commit moves: - CONFIG_SPI_FLASH_BAR from include/configs/*.h into configs/*_defconfigs Signed-off-by: Jagan Teki --- configs/maxbcm_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/maxbcm_defconfig') diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index c5b3b67024..b0b0d6c72c 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y -- cgit v1.2.1