This option controls using board/samsung/common/misc.c, so add a Kconfig file there as well and select it from the boards which use this functionality.
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/Kconfig | 1 + arch/arm/mach-exynos/Kconfig | 5 +++++ arch/arm/mach-s5pc1xx/Kconfig | 1 + board/samsung/common/Kconfig | 2 ++ include/configs/odroid.h | 6 ------ include/configs/odroid_xu3.h | 1 - include/configs/s5p_goni.h | 2 -- include/configs/s5pc210_universal.h | 3 --- include/configs/trats.h | 3 --- include/configs/trats2.h | 3 --- 10 files changed, 9 insertions(+), 18 deletions(-) create mode 100644 board/samsung/common/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 11dddba9a36b..1268bff5c54b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2342,6 +2342,7 @@ source "board/hisilicon/poplar/Kconfig" source "board/isee/igep003x/Kconfig" source "board/kontron/sl28/Kconfig" source "board/myir/mys_6ulx/Kconfig" +source "board/samsung/common/Kconfig" source "board/siemens/common/Kconfig" source "board/seeed/npi_imx6ull/Kconfig" source "board/socionext/developerbox/Kconfig" diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 84102908561e..29e35e443c6a 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -67,10 +67,12 @@ config TARGET_SMDKV310 select SUPPORT_SPL
config TARGET_TRATS + select MISC_COMMON bool "Exynos4210 Trats board"
config TARGET_S5PC210_UNIVERSAL bool "EXYNOS4210 Universal C210 board" + select MISC_COMMON
config TARGET_ORIGEN bool "Exynos4412 Origen board" @@ -79,9 +81,11 @@ config TARGET_ORIGEN
config TARGET_TRATS2 bool "Exynos4412 Trat2 board" + select MISC_COMMON
config TARGET_ODROID bool "Exynos4412 Odroid board" + select MISC_COMMON
endchoice endif @@ -113,6 +117,7 @@ config TARGET_ODROID_XU3 bool "Exynos5422 Odroid board" select EXYNOS5_DT select EXYNOS5420 + select MISC_COMMON select OF_CONTROL
config TARGET_ARNDALE diff --git a/arch/arm/mach-s5pc1xx/Kconfig b/arch/arm/mach-s5pc1xx/Kconfig index 8cffced5512b..b6a4b0b653fb 100644 --- a/arch/arm/mach-s5pc1xx/Kconfig +++ b/arch/arm/mach-s5pc1xx/Kconfig @@ -9,6 +9,7 @@ config TARGET_S5P_GONI select OF_CONTROL select BLK select DM_MMC + select MISC_COMMON
config TARGET_SMDKC100 bool "Support smdkc100 board" diff --git a/board/samsung/common/Kconfig b/board/samsung/common/Kconfig new file mode 100644 index 000000000000..849aeff61344 --- /dev/null +++ b/board/samsung/common/Kconfig @@ -0,0 +1,2 @@ +config MISC_COMMON + bool diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 8b00a2792150..f252b349437c 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -143,10 +143,4 @@ "kernel_addr_r=0x41000000\0" \ BOOTENV
-/* - * Supported Odroid boards: X3, U3 - * TODO: Add Odroid X support - */ -#define CONFIG_MISC_COMMON - #endif /* __CONFIG_H */ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index d2d7fca54450..5bbe7aadcb25 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -57,7 +57,6 @@ "params.bin raw 0x1880 0x20\0"
/* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ -#define CONFIG_MISC_COMMON #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)
/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 3d49d52b381c..fdade1ee66fa 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -61,8 +61,6 @@
#define COMMON_BOOT "${console} ${meminfo} ${mtdparts}"
-#define CONFIG_MISC_COMMON - #define CONFIG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x100000;" \ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 06be9c0f6528..80d3fc9258cc 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -95,9 +95,6 @@ void universal_spi_sda(int bit); int universal_spi_read(void); #endif
-/* Common misc for Samsung */ -#define CONFIG_MISC_COMMON - /* Download menu - definitions for check keys */ #ifndef __ASSEMBLY__
diff --git a/include/configs/trats.h b/include/configs/trats.h index 5bd0ca2a9645..ec18842bbe8c 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -125,9 +125,6 @@
/* GPT */
-/* Common misc for Samsung */ -#define CONFIG_MISC_COMMON - /* Download menu - definitions for check keys */ #ifndef __ASSEMBLY__
diff --git a/include/configs/trats2.h b/include/configs/trats2.h index cef563696bde..0aa331e39359 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -115,9 +115,6 @@
/* GPT */
-/* Common misc for Samsung */ -#define CONFIG_MISC_COMMON - /* Download menu - definitions for check keys */ #ifndef __ASSEMBLY__