avr32: move CONFIG_SYS_GENERIC_BOARD to Kconfig

Now all the AVR32 boards have been converted into Generic Board.
Select it in Kconfig and clean up defines in header files.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 200588aef6dad8ba16a919d3c4ce3835430fb94a..96db5c5088b6b6e0906a7b5dedc11bcf3ab5830d 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -25,6 +25,7 @@ config ARM
 config AVR32
        bool "AVR32 architecture"
        select HAVE_GENERIC_BOARD
+       select SYS_GENERIC_BOARD
 
 config BLACKFIN
        bool "Blackfin architecture"

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 56bd7f87d1536a1eb37dbc6aeec68f65c85cc6e1..c4a69526e70261be2d7110ca8d0b29447a618432 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -14,7 +14,6 @@
 #define CONFIG_AT32AP7000
 #define CONFIG_ATNGW100
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index ea1fb588a2e899073d2bd0b68bb190fd1469dd1d..868ec3a6cf98ee95916a12db4c7372f79e2e699f 100644 (file)
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -16,7 +16,6 @@
 #define CONFIG_AT32AP7000
 #define CONFIG_ATNGW100MKII
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 64b55192e5a64d207bb6789f2e7270b56a1d6199..4beb068da05ab097dce91dedaa9263aa65fbd6ae 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -95,7 +95,6 @@
 #define CONFIG_BOOTP_GATEWAY
 
 /* generic board */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 

diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 99d23892b7ba7e60942b98724f3d0491a2c6627a..e183f518d48cb3aa034e9a82d09fab6e9a510428 100644 (file)
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -62,7 +62,6 @@
 #define CONFIG_USART_BASE              ATMEL_BASE_USART1
 #define CONFIG_USART_ID                        1
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R