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 <ag...@denx.de>
Cc: Samuel Egli <samuel.e...@siemens.com>
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-imx/imx8/Kconfig | 2 ++
arch/arm/mach-omap2/am33xx/Kconfig | 6 ++++++
board/siemens/common/Kconfig | 2 ++
include/configs/capricorn-common.h | 2 --
include/configs/draco.h | 2 --
include/configs/etamin.h | 2 --
include/configs/pxm2.h | 2 --
include/configs/rastaban.h | 2 --
include/configs/rut.h | 2 --
include/configs/thuban.h | 2 --
11 files changed, 11 insertions(+), 14 deletions(-)
create mode 100644 board/siemens/common/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b60b47743e79..4b21955e8e69 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2331,6 +2331,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 51c3f21b6e76..2ba7454457dd 100644
--- 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 23865d4c0704..bd6b08655260 100644
--- 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
index 000000000000..131439fcfeac
--- /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 933fcfcfd287..4ca9e13ecf7a 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -24,8 +24,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 d30560810133..b4998f5c2e56 100644
--- 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 654faedf33e9..654bfc612168 100644
--- 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 7272470d12e6..ad05920ad6b1 100644
--- 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 8e20a448d2a7..6c942a809809 100644
--- 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 b30b12af52c3..fc3194654ae3 100644
--- 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 3b120073fef0..bb0b9fa1560d 100644
--- 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)
--
2.25.1
