summaryrefslogtreecommitdiff
path: root/config.mk
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-02-14 14:07:21 -0600
committerJon Loeliger <jdl@freescale.com>2008-02-14 14:07:21 -0600
commit746c4b9490495dc4381dbcc49f40078d423e0a48 (patch)
treee726020abb9e37df1fca19d8895bf203b27612d1 /config.mk
parent3f2ac8f928c76cbd2374437b2d079f8b4324aaba (diff)
parentfe891ecf4d187e9d11dde869ed4623af52b54451 (diff)
downloadu-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.zip
u-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.tar.gz
u-boot-imx-746c4b9490495dc4381dbcc49f40078d423e0a48.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'config.mk')
-rw-r--r--config.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/config.mk b/config.mk
index 79e5a31..bff95bd 100644
--- a/config.mk
+++ b/config.mk
@@ -147,7 +147,10 @@ OBJCFLAGS += --gap-fill=0xff
gccincdir := $(shell $(CC) -print-file-name=include)
CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \
- -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \
+ -D__KERNEL__
+ifneq ($(TEXT_BASE),)
+CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
+endif
ifneq ($(OBJTREE),$(SRCTREE))
CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include
@@ -185,7 +188,10 @@ endif
AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
-LDFLAGS += -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS += -Bstatic -T $(LDSCRIPT) $(PLATFORM_LDFLAGS)
+ifneq ($(TEXT_BASE),)
+LDFLAGS += -Ttext $(TEXT_BASE)
+endif
# Location of a usable BFD library, where we define "usable" as
# "built for ${HOST}, supports ${TARGET}". Sensible values are