kconfig: delete redundant CONFIG_${ARCH} definition

CONFIG_${ARCH} is defined by Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arc/config.mk b/arch/arc/config.mk
index a3b8df779e98fad2d433c9bbf511a3386642d668..e408800a919b36bc4bd64252c6b4b4602bf62118 100644 (file)
--- a/arch/arc/config.mk
+++ b/arch/arc/config.mk
@@ -21,7 +21,7 @@ ifeq ($(CROSS_COMPILE),)
 CROSS_COMPILE := $(ARC_CROSS_COMPILE)
 endif
 
-PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -DCONFIG_ARC -gdwarf-2
+PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2
 
 # Needed for relocation
 LDFLAGS_FINAL += -pie

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index c3b8289dcf06be3ffa1d07c2fa6b6e5c4a5d42d2..c339e6dc8cfbd683b6dfcef59935048e9282920c 100644 (file)
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -22,7 +22,7 @@ PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \
 # Support generic board on ARM
 __HAVE_ARCH_GENERIC_BOARD := y
 
-PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__
+PLATFORM_CPPFLAGS += -D__ARM__
 
 # Choose between ARM/Thumb instruction sets
 ifeq ($(CONFIG_SYS_THUMB_BUILD),y)

diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk
index 28a371c806449afc9da1c035ac098ce82ddc2920..469185e8b44bcef8cc23e77e5a620f8feae8cbfb 100644 (file)
--- a/arch/avr32/config.mk
+++ b/arch/avr32/config.mk
@@ -9,7 +9,6 @@ ifeq ($(CROSS_COMPILE),)
 CROSS_COMPILE := avr32-linux-
 endif
 
-PLATFORM_CPPFLAGS += -DCONFIG_AVR32
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
 
 PLATFORM_RELFLAGS      += -ffixed-r5 -fPIC -mno-init-got -mrelax

diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index fcaa44f1d6f3f9c9b7930cccf41e130cba1e89e3..7b17b757438fa14cc04f44e5d1ecf450bb8eeddd 100644 (file)
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -21,7 +21,6 @@ endif
 CONFIG_BFIN_BOOT_MODE := $(strip $(CONFIG_BFIN_BOOT_MODE:"%"=%))
 
 PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic
-PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN
 
 LDFLAGS_FINAL += --gc-sections
 LDFLAGS += -m elf32bfin

diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk
index 33b3d51af06ccf8d892554b275185782251f662f..3b3a7e88ab6077eb9de13dcbc4e0073b1787194b 100644 (file)
--- a/arch/m68k/config.mk
+++ b/arch/m68k/config.mk
@@ -11,7 +11,7 @@ endif
 
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
 
-PLATFORM_CPPFLAGS += -DCONFIG_M68K -D__M68K__
+PLATFORM_CPPFLAGS += -D__M68K__
 PLATFORM_LDFLAGS  += -n
 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
 PLATFORM_RELFLAGS += -ffixed-d7 -msep-data

diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index f4a234adbc1b8b610ed423bab2178640bdb74c30..a2d07aff1b1d5209fbb925b4a4399ee707e365e2 100644 (file)
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -25,7 +25,7 @@ endif
 # Default to EB if no endianess is configured
 ENDIANNESS ?= -EB
 
-PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__
+PLATFORM_CPPFLAGS += -D__MIPS__
 
 __HAVE_ARCH_GENERIC_BOARD := y
 

diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk
index 10248524d1f4656d86aa7cdc0edbd1bba1a114be..5ac9f90402c2ad15e432796c39e446c263adb8e0 100644 (file)
--- a/arch/nds32/config.mk
+++ b/arch/nds32/config.mk
@@ -17,6 +17,6 @@ CONFIG_STANDALONE_LOAD_ADDR = 0x300000 \
 
 PLATFORM_RELFLAGS      += -fno-strict-aliasing -fno-common -mrelax
 PLATFORM_RELFLAGS      += -gdwarf-2
-PLATFORM_CPPFLAGS      += -DCONFIG_NDS32 -D__nds32__ -G0 -ffixed-10 -fpie
+PLATFORM_CPPFLAGS      += -D__nds32__ -G0 -ffixed-10 -fpie
 
 LDFLAGS_u-boot         = --gc-sections --relax

diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
index 65a5a40b6d480020109fe43845411b47d9468b01..82bd887961b65b5848b7e30e66cb11221eb38632 100644 (file)
--- a/arch/nios2/config.mk
+++ b/arch/nios2/config.mk
@@ -12,7 +12,7 @@ endif
 
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
 
-PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__
+PLATFORM_CPPFLAGS += -D__NIOS2__
 PLATFORM_CPPFLAGS += -G0
 
 LDFLAGS_FINAL += --gc-sections

diff --git a/arch/openrisc/config.mk b/arch/openrisc/config.mk
index 9902b9adba8dafff17e1da0a332ad5a3b510c57b..cd95f24b1fbfb46a5ed9c8612614175d9dd9976e 100644 (file)
--- a/arch/openrisc/config.mk
+++ b/arch/openrisc/config.mk
@@ -11,6 +11,6 @@ endif
 
 # r10 used for global object pointer, already set in OR32 GCC but just to be
 # clear
-PLATFORM_CPPFLAGS += -DCONFIG_OPENRISC -D__OR1K__ -ffixed-r10
+PLATFORM_CPPFLAGS += -D__OR1K__ -ffixed-r10
 
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000

diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
index fb7096e7b5e2bd8bfc55d648cb680024790fa6a0..6329b6c74f57fccc898affe617dcb507d79c590e 100644 (file)
--- a/arch/powerpc/config.mk
+++ b/arch/powerpc/config.mk
@@ -13,7 +13,7 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
 LDFLAGS_FINAL += --gc-sections
 PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections \
                                                                -meabi
-PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ -ffixed-r2
+PLATFORM_CPPFLAGS += -D__powerpc__ -ffixed-r2
 PLATFORM_LDFLAGS  += -n
 
 # Support generic board on PPC

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index c3f889fb1cb1fcc1e6d8df22bd9ab652c46b9a7c..e38a44bd11011b68e6a7ba4bb64ab3cbabc811bd 100644 (file)
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -1,7 +1,7 @@
 # Copyright (c) 2011 The Chromium OS Authors.
 # SPDX-License-Identifier:     GPL-2.0+
 
-PLATFORM_CPPFLAGS += -DCONFIG_SANDBOX -D__SANDBOX__ -U_FORTIFY_SOURCE
+PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE
 PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD
 PLATFORM_LIBS += -lrt
 

diff --git a/arch/sparc/config.mk b/arch/sparc/config.mk
index be59f5819009f7a87a25d948e0f3c2bf5a4516de..196d28af84eddc41dbb08431595bb748079597c3 100644 (file)
--- a/arch/sparc/config.mk
+++ b/arch/sparc/config.mk
@@ -14,4 +14,4 @@ gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 -L $(gcclibdir) \
                               -T $(srctree)/examples/standalone/sparc.lds
 
-PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__
+PLATFORM_CPPFLAGS += -D__sparc__

diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk
index 4b2c873b0efce6bde6e1ea2d6a194e2ff1ea6083..f7b01d36e03c958d860d1a0692b9faf59be252dc 100644 (file)
--- a/arch/x86/cpu/config.mk
+++ b/arch/x86/cpu/config.mk
@@ -7,7 +7,7 @@
 
 CROSS_COMPILE ?= i386-linux-
 
-PLATFORM_CPPFLAGS += -DCONFIG_X86 -D__I386__ -Werror
+PLATFORM_CPPFLAGS += -D__I386__ -Werror
 
 # DO NOT MODIFY THE FOLLOWING UNLESS YOU REALLY KNOW WHAT YOU ARE DOING!
 LDPPFLAGS += -DRESET_SEG_START=0xffff0000

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index cb1df6bce17371a1460158b62fd14cf2aa0a9fc9..c8a02ae2fd6fa238dc85aeed4e41acbd92c3e8a2 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -12,7 +12,6 @@
 #include "../board/xilinx/microblaze-generic/xparameters.h"
 
 /* MicroBlaze CPU */
-#define        CONFIG_MICROBLAZE       1
 #define        MICROBLAZE_V5           1
 
 /* Open Firmware DTS */