bcm7445: move some configuration in defconfig file

Move some configurations in defconfig file
- CONFIG_DM_SPI (removed by syncing defconfigs )
- CONFIG_CMD_SF
- CONFIG_CMD_SPI
- CONFIG_CMD_SF_TEST

This allow correct dependency handling in Kconfig.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index a09ac5cc2b11a34035ee1e8bd76e5159e8471e0d..97098bf7e2e1f5dd8b4b0558cd5990bc5f247846 100644 (file)
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -8,6 +8,9 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_BOOTDELAY=1
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot>"
+CONFIG_CMD_SF=y
+CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_SPI=y
 CONFIG_OF_PRIOR_STAGE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC_SDHCI=y

diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h
index 8c675f773310c37a85c29589c4b0ff859afc7def..6984edde18f107b0c01e5a93260699e455485b75 100644 (file)
--- a/include/configs/bcm7445.h
+++ b/include/configs/bcm7445.h
@@ -34,10 +34,6 @@
 #define CONFIG_ENV_OFFSET      0x1e0000
 #define CONFIG_ENV_SECT_SIZE   CONFIG_ENV_SIZE
 
-#define CONFIG_DM_SPI                  1
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
-#define CONFIG_CMD_SF
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF_TEST
 
 #endif /* __CONFIG_H */