diff options
| -rw-r--r-- | common/Kconfig | 8 | ||||
| -rw-r--r-- | configs/axs101_defconfig | 1 | ||||
| -rw-r--r-- | configs/axs103_defconfig | 1 | ||||
| -rw-r--r-- | configs/odroid-xu3_defconfig | 1 | ||||
| -rw-r--r-- | configs/odroid_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/axs10x.h | 5 | ||||
| -rw-r--r-- | include/configs/hsdk.h | 5 | ||||
| -rw-r--r-- | include/configs/odroid.h | 1 | ||||
| -rw-r--r-- | include/configs/odroid_xu3.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
10 files changed, 12 insertions, 13 deletions
diff --git a/common/Kconfig b/common/Kconfig index 8f9d2959ba5..0a14bdedaa6 100644 --- 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 b77ecc17815..6ef6616554d 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 f42b694ca78..2208bdb9be6 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 e128d1c08ba..0f4d78a5945 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -32,11 +32,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x82000000 /* - * This board might be of different versions so handle it - */ -#define CONFIG_BOARD_TYPES - -/* * NAND Flash configuration */ #define CONFIG_SYS_NAND_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x16000) diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 9af1d12701c..7735cc17208 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -33,11 +33,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x82000000 /* - * This board might be of different versions so handle it - */ -#define CONFIG_BOARD_TYPES - -/* * UART configuration */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/odroid.h b/include/configs/odroid.h index c3520bb15f4..b8809c8dcc7 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 0337c264752..f178549a722 100644 --- 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 38c7f01fadb..2b3572568b1 100644 --- 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 |