Convert CONFIG_BOARD_TYPES to Kconfig

This converts the following to Kconfig:
   CONFIG_BOARD_TYPES

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/common/Kconfig b/common/Kconfig
index 8f9d2959ba5c3a348b21d1151046690964b6b13b..0a14bdedaa655c594860e7b3921b9aa12979bc1a 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -656,6 +656,14 @@ config BOUNCE_BUFFER
          A second possible use of bounce buffers is their ability to
          provide aligned buffers for DMA operations.
 
+config BOARD_TYPES
+       bool "Call get_board_type() to get and display the board type"
+       help
+         If this option is enabled, checkboard() will call get_board_type()
+         to get a string containing the board type and this will be
+         displayed immediately after the model is shown on the console
+         early in boot.
+
 menu "Start-up hooks"
 
 config ARCH_EARLY_INIT_R

diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index b77ecc178151a4b1e9ac39f8c9ef2d5e2e32454f..6ef6616554de2c9063fb2b8042338338636d873a 100644 (file)
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS3,115200n8"
+CONFIG_BOARD_TYPES=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="AXS# "

diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig
index f42b694ca78b203af9896b4af5c4cfdeab7b62cd..2208bdb9be69ca5c3ad9cf2f7425ba0a441d88ec 100644 (file)
--- a/configs/axs103_defconfig
+++ b/configs/axs103_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS3,115200n8"
+CONFIG_BOARD_TYPES=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="AXS# "

diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 11796e5bdf487c7630e155ae4815ea2f41e98570..f6f05b294833a8f9ff71448b5994f9a40d1b5432 100644 (file)
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_SYS_TEXT_BASE=0x43E00000
 CONFIG_ARCH_EXYNOS5=y
+CONFIG_BOARD_TYPES=y
 CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_NR_DRAM_BANKS=8

diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index cdb033ba780b5b7a56d88b60557d0fc7328a7e09..184bb62c1c1b49f4ccc567b386ba5a7e7408e7a4 100644 (file)
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_SYS_TEXT_BASE=0x43e00000
 CONFIG_ARCH_EXYNOS4=y
 CONFIG_TARGET_ODROID=y
+CONFIG_BOARD_TYPES=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_NR_DRAM_BANKS=8
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index e128d1c08baf8030490cc4412b557dc605c7b35d..0f4d78a5945521f090196cc1aafad817d2789648 100644 (file)
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -31,11 +31,6 @@
 #define CONFIG_SYS_BOOTM_LEN           SZ_128M
 #define CONFIG_SYS_LOAD_ADDR           0x82000000
 
-/*
- * This board might be of different versions so handle it
- */
-#define CONFIG_BOARD_TYPES
-
 /*
  * NAND Flash configuration
  */

diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index 9af1d12701cad6184213577d23b5069132696fdb..7735cc172080eeed852f279dbf6c4d048823bada 100644 (file)
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -32,11 +32,6 @@
 #define CONFIG_SYS_BOOTM_LEN           SZ_128M
 #define CONFIG_SYS_LOAD_ADDR           0x82000000
 
-/*
- * This board might be of different versions so handle it
- */
-#define CONFIG_BOARD_TYPES
-
 /*
  * UART configuration
  */

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index c3520bb15f40f07baeba0ece3628f447e74e6906..b8809c8dcc7cc032e3b92c464bfe358b8fc2494d 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -186,7 +186,6 @@
  * TODO: Add Odroid X support
  */
 #define CONFIG_MISC_COMMON
-#define CONFIG_BOARD_TYPES
 
 #undef CONFIG_REVISION_TAG
 

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 0337c2647523bb0665f7b8b1970fde070f06d0c3..f178549a7223c10bf99a5f00b8723d4fce72b67f 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -87,7 +87,6 @@
 /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
 #define CONFIG_ODROID_REV_AIN                  9
 #define CONFIG_REVISION_TAG
-#define CONFIG_BOARD_TYPES
 
 #undef CONFIG_SYS_BOARD
 #define CONFIG_SYS_BOARD       "odroid"

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 38c7f01fadb8ac18f2821f7ce0bc601990b820df..2b3572568b1ccb8c9d253ee553665f01eeb709ca 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -129,7 +129,6 @@ CONFIG_BOARD_POSTCLK_INIT
 CONFIG_BOARD_REVISION_TAG
 CONFIG_BOARD_SIZE_LIMIT
 CONFIG_BOARD_TAURUS
-CONFIG_BOARD_TYPES
 CONFIG_BOOGER
 CONFIG_BOOTBLOCK
 CONFIG_BOOTFILE