From patchwork Wed Jun 10 20:16:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 242101 List-Id: U-Boot discussion From: trini at konsulko.com (Tom Rini) Date: Wed, 10 Jun 2020 16:16:18 -0400 Subject: [PATCH 14/30] Convert CONFIG_BOARD_TYPES to Kconfig In-Reply-To: <20200610201634.8457-1-trini@konsulko.com> References: <20200610201634.8457-1-trini@konsulko.com> Message-ID: <20200610201634.8457-15-trini@konsulko.com> This converts the following to Kconfig: CONFIG_BOARD_TYPES Signed-off-by: Tom Rini --- configs/brsmarc1_defconfig | 1 + configs/mscc_jr2_defconfig | 1 + configs/mscc_luton_defconfig | 1 + configs/mscc_ocelot_defconfig | 1 + configs/mscc_serval_defconfig | 1 + configs/mscc_servalt_defconfig | 1 + include/configs/brsmarc1.h | 1 - include/configs/vcoreiii.h | 2 -- 8 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig index a7cf98fc746c..8333038c61b7 100644 --- a/configs/brsmarc1_defconfig +++ b/configs/brsmarc1_defconfig @@ -30,6 +30,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_BOARD_TYPES=y CONFIG_ARCH_MISC_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig index ab4f9b6255ba..d9173f408666 100644 --- a/configs/mscc_jr2_defconfig +++ b/configs/mscc_jr2_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="jr2 # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig index 55edb199993b..d5639016958d 100644 --- a/configs/mscc_luton_defconfig +++ b/configs/mscc_luton_defconfig @@ -21,6 +21,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="luton # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig index 3fe9e060bb56..a0e04bd4c749 100644 --- a/configs/mscc_ocelot_defconfig +++ b/configs/mscc_ocelot_defconfig @@ -18,6 +18,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="ocelot # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index e423fc4efc52..1c86c0dca39b 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -16,6 +16,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="serval # " # CONFIG_CMD_BDI is not set diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig index 49d8468226fc..91347682eef3 100644 --- a/configs/mscc_servalt_defconfig +++ b/configs/mscc_servalt_defconfig @@ -15,6 +15,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_LOGLEVEL=7 CONFIG_DISPLAY_CPUINFO=y +CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_SYS_PROMPT="servalt # " # CONFIG_CMD_BDI is not set diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index 5aa68d1d4695..acf13b830a2e 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -16,7 +16,6 @@ #include #include /* ------------------------------------------------------------------------- */ -#define CONFIG_BOARD_TYPES /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index 020f02caae9c..460433cb00bf 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -23,8 +23,6 @@ #endif #define CONFIG_SYS_NS16550_CLK CONFIG_SYS_MIPS_TIMER_FREQ -#define CONFIG_BOARD_TYPES - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #if defined(CONFIG_DDRTYPE_H5TQ1G63BFA) || defined(CONFIG_DDRTYPE_MT47H128M8HQ) #define CONFIG_SYS_SDRAM_SIZE (128 * SZ_1M)