This symbol appears to be globally used in the architecture, select it.
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/cpu/armv7/ls102xa/Kconfig | 4 ++++ include/configs/km/pg-wcom-ls102xa.h | 6 ------ include/configs/ls1021aiot.h | 2 -- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atsn.h | 2 -- include/configs/ls1021atwr.h | 2 -- 6 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index 369e68b8193b..7e138e0cc5be 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -2,6 +2,7 @@ config ARCH_LS1021A bool select FSL_DEVICE_DISABLE select FSL_IFC if !QSPI_BOOT && !SD_BOOT_QSPI + select LS102XA_STREAM_ID select SYS_FSL_DDR_BE if SYS_FSL_DDR select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR select SYS_FSL_IFC_BE @@ -37,6 +38,9 @@ config FSL_DEVICE_DISABLE config LS1_DEEP_SLEEP bool "Deep sleep"
+config LS102XA_STREAM_ID + bool + config MAX_CPUS int "Maximum number of CPUs permitted for LS102xA" default 2 diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index bbd2b36c45af..c1174b87ab7a 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -168,12 +168,6 @@
#define HWCONFIG_BUFFER_SIZE 256
-/* - * Miscellaneous configurable options - */ - -#define CONFIG_LS102XA_STREAM_ID - /* * Environment */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index a9680149807c..024a71852753 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -103,8 +103,6 @@ */ #define CFG_SYS_BOOTMAPSZ (256 << 20)
-#define CONFIG_LS102XA_STREAM_ID - #include <asm/fsl_secure_boot.h>
#endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 34d4c2fdeccc..5a91cc3efec0 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -295,8 +295,6 @@ */ #define CFG_SYS_BOOTMAPSZ (256 << 20)
-#define CONFIG_LS102XA_STREAM_ID - /* * Environment */ diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index a5b7364435dd..5612c60ae904 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -140,8 +140,6 @@ /* Miscellaneous configurable options */ #define CFG_SYS_BOOTMAPSZ (256 << 20)
-#define CONFIG_LS102XA_STREAM_ID - /* Environment */
#endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 059941e713a1..3c4c207edd06 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -297,8 +297,6 @@ */ #define CFG_SYS_BOOTMAPSZ (256 << 20)
-#define CONFIG_LS102XA_STREAM_ID - /* * Environment */