diff options
author | Andy Fleming <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
---|---|---|
committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
commit | 3f2175fa840925e2028c5d482e4cefa787cc8703 (patch) | |
tree | 37dab4aa866865e647beda2993e710b4f246fb8f /config.mk | |
parent | d1bcf9e53b41dfa4be6943b739ee82627a0a6d31 (diff) | |
parent | fe891ecf4d187e9d11dde869ed4623af52b54451 (diff) | |
download | u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.zip u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.tar.gz u-boot-imx-3f2175fa840925e2028c5d482e4cefa787cc8703.tar.bz2 |
Merge branch 'denx'
Diffstat (limited to 'config.mk')
-rw-r--r-- | config.mk | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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 |