diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ddef3d0..ef79fc3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2352,6 +2352,7 @@
 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 5e1b20a..8f185c1 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -57,11 +57,13 @@
 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 23865d4..bd6b086 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -138,6 +138,7 @@
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
+	select FACTORYSET
 	imply CMD_DM
 
 config TARGET_ETAMIN
@@ -146,6 +147,7 @@
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
+	select FACTORYSET
 	imply CMD_DM
 
 config TARGET_PCM051
@@ -168,6 +170,7 @@
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
+	select FACTORYSET
 	imply CMD_DM
 
 config TARGET_RASTABAN
@@ -176,6 +179,7 @@
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
+	select FACTORYSET
 	imply CMD_DM
 
 config TARGET_RUT
@@ -184,6 +188,7 @@
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
+	select FACTORYSET
 	imply CMD_DM
 
 config TARGET_THUBAN
@@ -192,6 +197,7 @@
 	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 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 0bbfe0c..4f0d69d 100644
--- 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 d305608..b4998f5 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 654faed..654bfc6 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 7272470..ad05920 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 8e20a44..6c942a8 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 b30b12a..fc31946 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 3b12007..bb0b9fa 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)