powerpc: ppc4xx: convert AMCC boards to generic board

Add CONFIG_SYS_GENERIC_BOARD to amcc-common.h and CONFIG_DISPLAY_BOARDINFO
to Kconfig files. canyonlands.h includes amcc-common.h, so remove
CONFIG_SYS_GENERIC_BOARD definition there.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Feng Kan <fkan@amcc.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Tom Rini <trini@konsulko.com>

diff --git a/board/amcc/acadia/Kconfig b/board/amcc/acadia/Kconfig
index 033deaf7d6df0512ed6ff57aa859a1e2e39f1baa..7c0ef534abfbb8bffe71bbac0537defaf81424c7 100644 (file)
--- a/board/amcc/acadia/Kconfig
+++ b/board/amcc/acadia/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "acadia"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/bamboo/Kconfig b/board/amcc/bamboo/Kconfig
index c0bd40aee77f7b4689425eb224541f84fe0d77cb..d44a36a5738a7253949a5c4f67410c15f66c60b3 100644 (file)
--- a/board/amcc/bamboo/Kconfig
+++ b/board/amcc/bamboo/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "bamboo"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/bubinga/Kconfig b/board/amcc/bubinga/Kconfig
index 540d9b623598aa213f581dbbbf93487cdd57ca07..fc40f6ed96a10ab52a829727bcb098be0ac6e3d7 100644 (file)
--- a/board/amcc/bubinga/Kconfig
+++ b/board/amcc/bubinga/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "bubinga"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/ebony/Kconfig b/board/amcc/ebony/Kconfig
index 62394b68fa9eaa153da091d2cfcc9d09c7be2dda..ba73148f7f05cffd106dded3479da342fe5a575d 100644 (file)
--- a/board/amcc/ebony/Kconfig
+++ b/board/amcc/ebony/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "ebony"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/katmai/Kconfig b/board/amcc/katmai/Kconfig
index fc606cff1cc15ea06f1ef78051e4a16a15367e7d..59d3ef5883687f2256961edf8bdeb674b9d5b5f3 100644 (file)
--- a/board/amcc/katmai/Kconfig
+++ b/board/amcc/katmai/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "katmai"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/kilauea/Kconfig b/board/amcc/kilauea/Kconfig
index 3f2f4348274c9dc62d4269ed058e9dda14c34120..5dfd9ebe3fbeb19e0eded709e851fdad3b766e0c 100644 (file)
--- a/board/amcc/kilauea/Kconfig
+++ b/board/amcc/kilauea/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "kilauea"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/luan/Kconfig b/board/amcc/luan/Kconfig
index 3df90af484d634cc4977a230976ec9ef2a322093..36b44fffa95167431028f2fda7697834fee890d1 100644 (file)
--- a/board/amcc/luan/Kconfig
+++ b/board/amcc/luan/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "luan"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/makalu/Kconfig b/board/amcc/makalu/Kconfig
index 31ce5f10c679fc5b0f3f0b00b92574938bed28be..7f8498a5337038c7ff8571bf62633ab6f97f06dd 100644 (file)
--- a/board/amcc/makalu/Kconfig
+++ b/board/amcc/makalu/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "makalu"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/ocotea/Kconfig b/board/amcc/ocotea/Kconfig
index 18c1a15ef4261fad804e67cceb299fd650965e98..489e8a4da3a6a7d6f4d980062078f83ffd8c5bac 100644 (file)
--- a/board/amcc/ocotea/Kconfig
+++ b/board/amcc/ocotea/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "ocotea"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/redwood/Kconfig b/board/amcc/redwood/Kconfig
index d7105909985b400f55ff538cef6d62fa7f7bbe38..fee644146e631af0f88ebba009c037843ffb1033 100644 (file)
--- a/board/amcc/redwood/Kconfig
+++ b/board/amcc/redwood/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "redwood"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/sequoia/Kconfig b/board/amcc/sequoia/Kconfig
index 67ee3ca2eb630df957f7c42d0abef8986f809315..6e6e408ed5efee3986e74c603eb16775d50f7ad4 100644 (file)
--- a/board/amcc/sequoia/Kconfig
+++ b/board/amcc/sequoia/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "sequoia"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/taihu/Kconfig b/board/amcc/taihu/Kconfig
index fc5cb1de7e796c09951d445555864ab241465b16..faafb089413a85bca6ce99fe4400ba6580a666d6 100644 (file)
--- a/board/amcc/taihu/Kconfig
+++ b/board/amcc/taihu/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "taihu"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/taishan/Kconfig b/board/amcc/taishan/Kconfig
index abd07f570d5cf97cd11ce44724d617cce9dbdb19..9ad8a4ce643d3485066a2c073aafe8bf650198bf 100644 (file)
--- a/board/amcc/taishan/Kconfig
+++ b/board/amcc/taishan/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "taishan"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/walnut/Kconfig b/board/amcc/walnut/Kconfig
index 94e3dc9e78b863cfbe3915896f9bf8dc48ab03d3..d4c451dc077e9665ef8c69f4c20e862e5cb9c4ab 100644 (file)
--- a/board/amcc/walnut/Kconfig
+++ b/board/amcc/walnut/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "walnut"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/yosemite/Kconfig b/board/amcc/yosemite/Kconfig
index dfa10687c2c1c033f4e0887fe58a8af72fdc2d7a..ec5123630660abf7117bfce86ff0919b445515e2 100644 (file)
--- a/board/amcc/yosemite/Kconfig
+++ b/board/amcc/yosemite/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "yosemite"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/board/amcc/yucca/Kconfig b/board/amcc/yucca/Kconfig
index 61d95891e4310940c3f43216bbdce7909ee38858..338b6a90c9dfdc8f18388c4af03d64afa74c466c 100644 (file)
--- a/board/amcc/yucca/Kconfig
+++ b/board/amcc/yucca/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "yucca"
 
+config DISPLAY_BOARDINFO
+       bool
+       default y
+
 endif

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 73e1b0afa805b3a0877029d02d000064096393d7..d5b6e37a38fd882adef40f1d70c36b1a310da98d 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -10,6 +10,8 @@
 #ifndef __AMCC_COMMON_H
 #define __AMCC_COMMON_H
 
+#define CONFIG_SYS_GENERIC_BOARD
+
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* Start of U-Boot      */
 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)

diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 7a1499d2e3a579b6b8134f413f884a16472d5709..ed790ccaf3a83594273d36ae86f25a5700b8584f 100644 (file)
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -13,8 +13,6 @@
 
 #include <linux/kconfig.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*-----------------------------------------------------------------------
  * High Level Configuration Options
  *----------------------------------------------------------------------*/