avr32: move CONFIG_AVR32 definition to arch/avr32/config.mk

Like other architectures, CONFIG_AVR32 can be defined
in arch/avr32/config.mk rather than board header files.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>

diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk
index 4ab4745edfc7074936f741a03dda4603abb82209..b9b96313c5f4b4358783fdd62dda17b069655eda 100644 (file)
--- a/arch/avr32/config.mk
+++ b/arch/avr32/config.mk
@@ -6,7 +6,7 @@
 #
 
 CROSS_COMPILE ?= avr32-linux-
-
+PLATFORM_CPPFLAGS += -DCONFIG_AVR32
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
 
 PLATFORM_RELFLAGS      += -ffixed-r5 -fPIC -mno-init-got -mrelax

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 597bede85e95dfe00f6568164e249c355e8ad447..9c81e3199f916d49d498d6ce3c5a7bd68ec95aec 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -10,7 +10,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_ATNGW100

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index bd4dca521709584c494b25f4872b181712d0c124..066d09ab0a119a8ff7bde1a4f1e54faa752c52ea 100644 (file)
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -12,7 +12,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_ATNGW100MKII

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index fd76572a47595999cd2bd5a877f9dac549b25f18..8f3fd0bb00018e1cc6725642220cf775519eb10a 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -10,7 +10,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_ATSTK1002

diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 2562460b98ad6308230ebf5ba73b1ab51b81422c..63704b19875d6d7bcc0d2ebf8c7528ff15845c00 100644 (file)
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -10,7 +10,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7001
 #define CONFIG_ATSTK1003

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index 8e32a10b19f18b50ece5427c4194b397f4239274..331a60d76aaa17aac9e6a5da470070ab56e65fcb 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -10,7 +10,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7002
 #define CONFIG_ATSTK1004

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index 9ce22649e719776c533d62ef1c2b0ed90bde3f74..bbe0aea8616f9e91c4ead982228c430ed476be56 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -10,7 +10,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_ATSTK1006

diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index fc015e69395c4b38d7fb584f667874707732b607..338d3dc78239b30a2d71412812fcf0574ee8d827 100644 (file)
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -10,7 +10,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_FAVR32_EZKIT

diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 938ee862819fef2fc06de40e0cebca0fac55b6cd..73534addfc1bcf6581515b11f1b9a67f8df00794 100644 (file)
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -11,7 +11,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 

diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index 3f2fadbb589a16a91cc83596fc93c0a6cdb3ab7b..4f0603abc13290b05e61ee5382e975d4231eb8f1 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -8,7 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_HAMMERHEAD

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 3d792398c518a276494f451dfcfde2517e69c628..fc7ecfaee47605af7055ea6c3be2c429543496da 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -10,7 +10,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_MIMC200