Message ID | 1434017690-22711-1-git-send-email-yamada.masahiro@socionext.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On 06/11/2015 12:14 PM, Masahiro Yamada wrote: > 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> @Tom: Could you please pick it up directly? Andreas
On Thu, Jun 11, 2015 at 07:14:50PM +0900, Masahiro Yamada wrote: > 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> Applied to u-boot/master, thanks!
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
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> --- 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(-)