generic-board: select SYS_GENERIC_BOARD for some architectures

We have done with the generic board conversion for all the boards
of ARC, Blackfin, M68000, MicroBlaze, MIPS, NIOS2, Sandbox, X86.

Let's select SYS_GENERIC_BOARD for those architectures, so we can
tell which architecture has finished the conversion at a glance.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alexey Brodkin <abrodkin@synopsys.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index cdd166218fb1e364c5d0ff462d4a3ad8301809fd..ca617e75ab92557165048bc025506bbb478ed76a 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1,6 +1,10 @@
 config HAVE_GENERIC_BOARD
        bool
 
+config SYS_GENERIC_BOARD
+       bool
+       depends on HAVE_GENERIC_BOARD
+
 choice
        prompt "Architecture select"
        default SANDBOX
@@ -9,6 +13,7 @@ config ARC
        bool "ARC architecture"
        select HAVE_PRIVATE_LIBGCC
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
 
 config ARM
        bool "ARM architecture"
@@ -23,20 +28,24 @@ config AVR32
 config BLACKFIN
        bool "Blackfin architecture"
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
 
 config M68K
        bool "M68000 architecture"
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
 
 config MICROBLAZE
        bool "MicroBlaze architecture"
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
        select SUPPORT_OF_CONTROL
 
 config MIPS
        bool "MIPS architecture"
        select HAVE_PRIVATE_LIBGCC
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
 
 config NDS32
        bool "NDS32 architecture"
@@ -44,6 +53,7 @@ config NDS32
 config NIOS2
        bool "Nios II architecture"
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
 
 config OPENRISC
        bool "OpenRISC architecture"
@@ -57,6 +67,7 @@ config PPC
 config SANDBOX
        bool "Sandbox"
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
        select SUPPORT_OF_CONTROL
 
 config SH
@@ -70,6 +81,7 @@ config X86
        bool "x86 architecture"
        select HAVE_PRIVATE_LIBGCC
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
        select SUPPORT_OF_CONTROL
 
 endchoice

diff --git a/arch/arc/include/asm/config.h b/arch/arc/include/asm/config.h
index b4e9099fb165ec14b3815bb062604428c44702f0..8936f5cdf79be40875c6624c5ab3f48ab7f9824a 100644 (file)
--- a/arch/arc/include/asm/config.h
+++ b/arch/arc/include/asm/config.h
@@ -7,7 +7,6 @@
 #ifndef __ASM_ARC_CONFIG_H_
 #define __ASM_ARC_CONFIG_H_
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SYS_GENERIC_GLOBAL_DATA
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 #define CONFIG_ARCH_EARLY_INIT_R

diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index 73cbfa2cc8bf418da10c0c220b52f5cefdb7d1aa..d2cf71bfafc3f003a12905d122e5c471cd68a7ea 100644 (file)
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -174,7 +174,6 @@
        }
 #endif
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_ARCH_MISC_INIT
 

diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h
index 75908428819b464a792e1c6d519bdd2b0c1675c0..e1458acd2c76091b5217f163e72e0654973236d0 100644 (file)
--- a/arch/m68k/include/asm/config.h
+++ b/arch/m68k/include/asm/config.h
@@ -7,7 +7,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SYS_GENERIC_GLOBAL_DATA
 
 #define CONFIG_NEEDS_MANUAL_RELOC

diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h
index 32fd636b61dfc3ff4f89e764e32ffa958182fc99..4af408a7610e539c1f40e81da46b86ca3f2b674b 100644 (file)
--- a/arch/microblaze/include/asm/config.h
+++ b/arch/microblaze/include/asm/config.h
@@ -12,6 +12,5 @@
 #endif
 
 #define CONFIG_NR_DRAM_BANKS   1
-#define CONFIG_SYS_GENERIC_BOARD
 
 #endif

diff --git a/arch/nios2/include/asm/config.h b/arch/nios2/include/asm/config.h
index 476a32bdc6529089e7b477086682c6820ed2b28e..9c13848ea2b93d4e072304ce24cfc26e4a8b1c2d 100644 (file)
--- a/arch/nios2/include/asm/config.h
+++ b/arch/nios2/include/asm/config.h
@@ -7,7 +7,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SYS_GENERIC_GLOBAL_DATA
 
 #endif

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index e477a8400cd5b3275af9912be104b0ab05d3a54e..b05a90fb18593b79656b2109d80b847bcc93af47 100644 (file)
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 
 PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE
-PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD
+PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM
 PLATFORM_LIBS += -lrt
 
 # Define this to avoid linking with SDL, which requires SDL libraries

diff --git a/arch/x86/include/asm/config.h b/arch/x86/include/asm/config.h
index ff15828a713de5d1258aada2dc5aa599734ca900..3a891ba62727511706291cf292b0fb23b7ec2a02 100644 (file)
--- a/arch/x86/include/asm/config.h
+++ b/arch/x86/include/asm/config.h
@@ -7,7 +7,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 2a785b3fc31590983f420aea2becffca1131b598..37aa1249fcedbfd2ca8c1de8fbe091d551f9ed86 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -12,8 +12,6 @@
 #define CONFIG_AMCORE
 #define CONFIG_HOSTNAME                        AMCORE
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_MCF530x
 #define CONFIG_M5307
 

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 5bbd4431d1ba02d1d239390f0732f25a57ec8644..e32701f17d7957922f1e0212ce2974a74ed1ae10 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -14,7 +14,6 @@
 
 #define CONFIG_DBAU1X00                1
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifdef CONFIG_DBAU1000

diff --git a/include/configs/malta.h b/include/configs/malta.h
index 354672ecf8735e9240b119a801df2ffba0b91ab1..9445c9b1d72594873bad702371978f9f91dfaf63 100644 (file)
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -14,7 +14,6 @@
  * System configuration
  */
 #define CONFIG_MALTA
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_DISPLAY_BOARDINFO
 

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index f92004855586630a4146835c980145dadb7ba94a..eea587cb24ae0d0d2e7f6be596ca874a035cd27b 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -14,7 +14,6 @@
 
 #define CONFIG_PB1X00          1
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifdef CONFIG_PB1000

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 1548d3e682d99bdb64a59d3b2475468e7ef69a0e..75da8a1ebe67f035bdae84d03f05f2a188e857dd 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -14,7 +14,6 @@
 
 #define CONFIG_QEMU_MIPS
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_R
 

diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 61cafadd7cf47872cbdc026c861109ff43a6d558..b07ca4e02a4e8a3a76e6d86c1f2e4e3ed1c070d3 100644 (file)
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -14,7 +14,6 @@
 
 #define CONFIG_QEMU_MIPS
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_R
 

diff --git a/include/configs/vct.h b/include/configs/vct.h
index 83e4163e3f897e802443416ed8e9b155dd101178..88e58ec54beb771c065fc8fe702f24caae4988f6 100644 (file)
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -25,7 +25,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO
 
 #define CPU_CLOCK_RATE                 324000000 /* Clock for the MIPS core */