siemens: Move CONFIG_FACTORYSET to Kconfig

Introduce board/siemens/common/Kconfig and have it hold FACTORYSET to
start with.  Use select for this on the boards that need it.

Cc: Anatolij Gustschin <agust@denx.de>
Cc: Samuel Egli <samuel.egli@siemens.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ddef3d03ab739c40cb43075ccf548204096ac587..ef79fc3a0a766c91c5e90e49e80bfc7866726514 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2352,6 +2352,7 @@ source "board/hisilicon/poplar/Kconfig"
 source "board/isee/igep003x/Kconfig"
 source "board/kontron/sl28/Kconfig"
 source "board/myir/mys_6ulx/Kconfig"
+source "board/siemens/common/Kconfig"
 source "board/seeed/npi_imx6ull/Kconfig"
 source "board/socionext/developerbox/Kconfig"
 source "board/st/stv0991/Kconfig"

diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index 5e1b20a422971b0582268a0f77c7719c61e5b356..8f185c192d52b11b9a68dfa9e9de970d1f7c74bd 100644 (file)
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -57,11 +57,13 @@ config TARGET_COLIBRI_IMX8X
 config TARGET_DENEB
        bool "Support i.MX8QXP Capricorn Deneb board"
        select BOARD_LATE_INIT
+       select FACTORYSET
        select IMX8QXP
 
 config TARGET_GIEDI
        bool "Support i.MX8QXP Capricorn Giedi board"
        select BOARD_LATE_INIT
+       select FACTORYSET
        select IMX8QXP
 
 config TARGET_IMX8QM_MEK

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 23865d4c070422e668ddcc3a76dc04cbb54a9a0f..bd6b086552606d569dbb53466e96f17447752418 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -138,6 +138,7 @@ config TARGET_DRACO
        select DM
        select DM_GPIO
        select DM_SERIAL
+       select FACTORYSET
        imply CMD_DM
 
 config TARGET_ETAMIN
@@ -146,6 +147,7 @@ config TARGET_ETAMIN
        select DM
        select DM_GPIO
        select DM_SERIAL
+       select FACTORYSET
        imply CMD_DM
 
 config TARGET_PCM051
@@ -168,6 +170,7 @@ config TARGET_PXM2
        select DM
        select DM_GPIO
        select DM_SERIAL
+       select FACTORYSET
        imply CMD_DM
 
 config TARGET_RASTABAN
@@ -176,6 +179,7 @@ config TARGET_RASTABAN
        select DM
        select DM_GPIO
        select DM_SERIAL
+       select FACTORYSET
        imply CMD_DM
 
 config TARGET_RUT
@@ -184,6 +188,7 @@ config TARGET_RUT
        select DM
        select DM_GPIO
        select DM_SERIAL
+       select FACTORYSET
        imply CMD_DM
 
 config TARGET_THUBAN
@@ -192,6 +197,7 @@ config TARGET_THUBAN
        select DM
        select DM_GPIO
        select DM_SERIAL
+       select FACTORYSET
        imply CMD_DM
 
 config TARGET_PDU001

diff --git a/board/siemens/common/Kconfig b/board/siemens/common/Kconfig
new file mode 100644 (file)
index 0000000..131439f
--- /dev/null
+++ b/board/siemens/common/Kconfig
@@ -0,0 +1,2 @@
+config FACTORYSET
+       bool

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 0bbfe0c21740a360d77842811a3835c1baba595c..4f0d69db2a29ad0936086fcc9e4c9dddf5900eb1 100644 (file)
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -23,8 +23,6 @@
 
 #endif /* CONFIG_SPL_BUILD */
 
-#define CONFIG_FACTORYSET
-
 /* ENET1 connects to base board and MUX with ESAI */
 #define CONFIG_FEC_ENET_DEV            1
 #define CONFIG_FEC_MXC_PHYADDR         0x0

diff --git a/include/configs/draco.h b/include/configs/draco.h
index d305608101331937bcf514bcf031db0cc4d514e4..b4998f5c2e56c6683349829cfc68fe41ffb6efd4 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -27,8 +27,6 @@
  /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
 
-#define CONFIG_FACTORYSET
-
 /* Define own nand partitions */
 #define CONFIG_ENV_RANGE        (4 * CONFIG_SYS_ENV_SECT_SIZE)
 

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 654faedf33e9ef6c931aae5b62817355c0e6fbea..654bfc61216898a7fa7503ccb9a30d87e46edad0 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -75,8 +75,6 @@
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
 
-#define CONFIG_FACTORYSET
-
 /* nedded by compliance test in read mode */
 
 /* Define own nand partitions */

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 7272470d12e6232bbebf3692ef65e580952ddae0..ad05920ad6b10061defa0cbd4f9a375d98abbe71 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -30,8 +30,6 @@
  /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE       (512 << 20)     /* 1GB */
 
-#define CONFIG_FACTORYSET
-
 #ifndef CONFIG_SPL_BUILD
 
 /* Use common default */

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 8e20a448d2a79ea3800023955ce0b0d73ae197aa..6c942a809809133a32c77e5cea486103ed5cebd4 100644 (file)
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -37,8 +37,6 @@
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
 
-#define CONFIG_FACTORYSET
-
 /* Define own nand partitions */
 #define CONFIG_ENV_RANGE               (4 * CONFIG_SYS_ENV_SECT_SIZE)
 

diff --git a/include/configs/rut.h b/include/configs/rut.h
index b30b12af52c3f238f0cc860b029624adf83719e6..fc3194654ae3283767e3984284db07696eb168b2 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -21,8 +21,6 @@
  /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE       (256 << 20) /* 256 MiB */
 
-#define CONFIG_FACTORYSET
-
 /* Watchdog */
 #define WATCHDOG_TRIGGER_GPIO  14
 

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 3b120073fef0d7b5c5058212c38f48d405202e1c..bb0b9fa1560db8704b1bdd7b8f83a586357bcaab 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -30,8 +30,6 @@
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
 
-#define CONFIG_FACTORYSET
-
 /* Define own nand partitions */
 #define CONFIG_ENV_RANGE        (4 * CONFIG_SYS_ENV_SECT_SIZE)