[U-Boot] [PATCH v2 02/11] Convert CONFIG_BOARD_TYPES to Kconfig

Simon Glass
2018-12-17T02:36:29Z

This converts the following to Kconfig:
CONFIG_BOARD_TYPES

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Remove stranded comments in the header files

common/Kconfig | 8 ++++++++
configs/axs101_defconfig | 1 +
configs/axs103_defconfig | 1 +
configs/odroid-xu3_defconfig | 1 +
configs/odroid_defconfig | 1 +
include/configs/axs10x.h | 5 -----
include/configs/hsdk.h | 5 -----
include/configs/odroid.h | 1 -
include/configs/odroid_xu3.h | 1 -
scripts/config_whitelist.txt | 1 -
10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig
index 57bd16d9623..a118bbb4b65 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -645,6 +645,14 @@ config DISPLAY_BOARDINFO_LATE
the relocation phase. The board function checkboard() is called to do
this.

+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 b4621c359fc..126ee1a3edf 100644
--- 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 e7894d297cd..c50d51b189b 100644
--- 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 11796e5bdf4..f6f05b29483 100644
--- 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 cdb033ba780..184bb62c1c1 100644
--- 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 1b2966fd612..79411282ce2 100644
--- 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 cdf4fddd940..d8331206cd9 100644
--- 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 ad77242e380..bc044e069e0 100644
--- 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 f683ee46e39..c2363dd1eef 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -86,7 +86,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 b8addeaf693..335977b3038 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -132,7 +132,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
--
2.20.0.405.gbc1bbc6f85-goog