From 2ce6ecaccaa0b1bea31cdbe05f5f5c54d2468db0 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 11 Jun 2015 19:14:50 +0900 Subject: [PATCH] avr32: move CONFIG_SYS_GENERIC_BOARD to Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Acked-by: Andreas Bießmann --- arch/Kconfig | 1 + include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/grasshopper.h | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 200588a..96db5c5 100644 --- 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 56bd7f8..c4a6952 100644 --- 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 ea1fb58..868ec3a 100644 --- 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 64b5519..4beb068 100644 --- 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 99d2389..e183f51 100644 --- 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 -- 2.7.4