Commit 5db752353b6a19c50db4a30692efb7e845fb8a6e

Authored by Anatolij Gustschin
Committed by Tom Rini
1 parent 80ee0196a6

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>

Showing 18 changed files with 66 additions and 2 deletions Side-by-side Diff

board/amcc/acadia/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "acadia"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/bamboo/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "bamboo"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/bubinga/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "bubinga"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/ebony/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "ebony"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/katmai/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "katmai"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/kilauea/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "kilauea"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/luan/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "luan"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/makalu/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "makalu"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/ocotea/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "ocotea"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/redwood/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "redwood"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/sequoia/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "sequoia"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/taihu/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "taihu"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/taishan/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "taishan"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/walnut/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "walnut"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/yosemite/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "yosemite"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
board/amcc/yucca/Kconfig
... ... @@ -9,5 +9,9 @@
9 9 config SYS_CONFIG_NAME
10 10 default "yucca"
11 11  
  12 +config DISPLAY_BOARDINFO
  13 + bool
  14 + default y
  15 +
12 16 endif
include/configs/amcc-common.h
... ... @@ -10,6 +10,8 @@
10 10 #ifndef __AMCC_COMMON_H
11 11 #define __AMCC_COMMON_H
12 12  
  13 +#define CONFIG_SYS_GENERIC_BOARD
  14 +
13 15 #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */
14 16 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of U-Boot */
15 17 #define CONFIG_SYS_MONITOR_LEN (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
include/configs/canyonlands.h
... ... @@ -13,8 +13,6 @@
13 13  
14 14 #include <linux/kconfig.h>
15 15  
16   -#define CONFIG_SYS_GENERIC_BOARD
17   -
18 16 /*-----------------------------------------------------------------------
19 17 * High Level Configuration Options
20 18 *----------------------------------------------------------------------*/