Merge branch 'origin'

[u-boot] / config.mk

diff --git a/config.mk b/config.mk
index 2c6cfb4b3ce8416ff696dece936d96d4787783e2..dfbb1b7c6f220f4f12f467e66fb76c7d979e5ae4 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -53,6 +53,10 @@ PLATFORM_CPPFLAGS+= -D__ARM__
 endif
 endif
 
+ifeq ($(ARCH),blackfin)
+PLATFORM_CPPFLAGS+= -D__BLACKFIN__ -mno-underscore
+endif
+
 ifdef  ARCH
 sinclude $(TOPDIR)/$(ARCH)_config.mk   # include architecture dependend rules
 endif
@@ -131,10 +135,6 @@ else
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes
 endif
 
-ifdef WILD_WILD_WEST
-CFLAGS := $(CFLAGS) -Werror
-endif
-
 # avoid trigraph warnings while parsing pci.h (produced by NIOS gcc-2.9)
 # this option have to be placed behind -Wall -- that's why it is here
 ifeq ($(ARCH),nios)