* Add support for IceCube board (with MGT5100 and MPC5200 CPUs)

[oweals/u-boot.git] / config.mk

diff --git a/config.mk b/config.mk
index f0f8aa86b69791abe2c854d52b9f59ed83c15a30..c8358cf7825b64a1c3a30793c7356da602ef1cd4 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -23,6 +23,11 @@
 
 #########################################################################
 
+# clean the slate ...
+PLATFORM_RELFLAGS =
+PLATFORM_CPPFLAGS =
+PLATFORM_LDFLAGS =
+
 #
 # When cross-compiling on NetBSD, we have to define __PPC__ or else we
 # will pick up a va_list declaration that is incompatible with the
@@ -96,14 +101,18 @@ RANLIB     = $(CROSS_COMPILE)RANLIB
 RELFLAGS= $(PLATFORM_RELFLAGS)
 DBGFLAGS= -g #-DDEBUG
 OPTFLAGS= -Os #-fomit-frame-pointer
+ifndef LDSCRIPT
 #LDSCRIPT := board/$(BOARDDIR)/u-boot.lds.debug
 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
-OBJCFLAGS := --gap-fill=0xff
+endif
+OBJCFLAGS += --gap-fill=0xff
+
+gccincdir := $(shell $(CC) -print-file-name=include)
 
 CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS)                \
        -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE)           \
        -I$(TOPDIR)/include                             \
-       -fno-builtin                                    \
+       -fno-builtin -nostdinc -isystem $(gccincdir)    \
        -pipe $(PLATFORM_CPPFLAGS)
 
 ifdef BUILD_TAG
@@ -131,11 +140,15 @@ LDFLAGS += -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
 ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc)
 BFD_ROOT_DIR =         /usr/local/tools
 else
+ifeq ($(HOSTARCH),$(ARCH))
+# native
+BFD_ROOT_DIR =         /usr
+else
 #BFD_ROOT_DIR =                /LinuxPPC/CDK           # Linux/i386
 #BFD_ROOT_DIR =                /usr/pkg/cross          # NetBSD/i386
-#BFD_ROOT_DIR =                /usr                    # native
 BFD_ROOT_DIR =         /opt/powerpc
 endif
+endif
 
 #########################################################################