From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 6 Jan 2014 06:45:09 +0000 (+0900)
Subject: avr32: move CONFIG_AVR32 definition to arch/avr32/config.mk
X-Git-Tag: v2025.01-rc5-pxa1908~15479^2~27
X-Git-Url: http://git.dujemihanovic.xyz/html/static/gitweb.css?a=commitdiff_plain;h=5378d5eabe8943bcff0d93ba43df3a5b246d4138;p=u-boot.git

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 4ab4745edf..b9b96313c5 100644
--- 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 597bede85e..9c81e3199f 100644
--- 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 bd4dca5217..066d09ab0a 100644
--- 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 fd76572a47..8f3fd0bb00 100644
--- 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 2562460b98..63704b1987 100644
--- 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 8e32a10b19..331a60d76a 100644
--- 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 9ce22649e7..bbe0aea861 100644
--- 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 fc015e6939..338d3dc782 100644
--- 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 938ee86281..73534addfc 100644
--- 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 3f2fadbb58..4f0603abc1 100644
--- 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 3d792398c5..fc7ecfaee4 100644
--- 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