summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-02-01 21:38:07 +0100
committerWolfgang Denk <wd@denx.de>2009-02-01 21:38:07 +0100
commit6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd (patch)
tree0458ea450c3674b3d7aba64157e346f1d2553278 /examples
parentee924e00300bd1136589b2d5f8ad1f008df01bd4 (diff)
parent4e69087a1d6ef2eca6f46026cf5e7399b6c9e7c0 (diff)
downloadu-boot-imx-6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd.zip
u-boot-imx-6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd.tar.gz
u-boot-imx-6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/Makefile b/examples/Makefile
index b0a8853..927010d 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -33,9 +33,13 @@ ifeq ($(ARCH),arm)
ifeq ($(BOARD),omap2420h4)
LOAD_ADDR = 0x80300000
else
+ifeq ($(CPU),omap3)
+LOAD_ADDR = 0x80300000
+else
LOAD_ADDR = 0xc100000
endif
endif
+endif
ifeq ($(ARCH),mips)
LOAD_ADDR = 0x80200000 -T mips.lds