summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-01-06 15:45:09 +0900
committerTom Rini <trini@ti.com>2014-01-24 16:59:07 -0500
commit5378d5eabe8943bcff0d93ba43df3a5b246d4138 (patch)
treedb8c53e9404dbde13e786a18c5777e99ea0320d9
parentd937326ffcd6da4c6ba1297a8786cfeaec1812e7 (diff)
downloadblackbird-obmc-uboot-5378d5eabe8943bcff0d93ba43df3a5b246d4138.tar.gz
blackbird-obmc-uboot-5378d5eabe8943bcff0d93ba43df3a5b246d4138.zip
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>
-rw-r--r--arch/avr32/config.mk2
-rw-r--r--include/configs/atngw100.h1
-rw-r--r--include/configs/atngw100mkii.h1
-rw-r--r--include/configs/atstk1002.h1
-rw-r--r--include/configs/atstk1003.h1
-rw-r--r--include/configs/atstk1004.h1
-rw-r--r--include/configs/atstk1006.h1
-rw-r--r--include/configs/favr-32-ezkit.h1
-rw-r--r--include/configs/grasshopper.h1
-rw-r--r--include/configs/hammerhead.h1
-rw-r--r--include/configs/mimc200.h1
11 files changed, 1 insertions, 11 deletions
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
OpenPOWER on IntegriCloud