summaryrefslogtreecommitdiffstats
path: root/board/ttcontrol
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-29 21:50:24 +0200
committerWolfgang Denk <wd@denx.de>2010-10-29 21:50:24 +0200
commitd75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (patch)
tree2bf529f0ee08c530a46def3d6d4727ccdcaef236 /board/ttcontrol
parent17dd883c5b76bdade0f7a48f2eb02d918a5ebef9 (diff)
parent1ab027cbf6536f40348699a7b7bfa8bbedf88c8e (diff)
downloadtalos-obmc-uboot-d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f.tar.gz
talos-obmc-uboot-d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f.zip
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'board/ttcontrol')
-rw-r--r--board/ttcontrol/vision2/config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/ttcontrol/vision2/config.mk b/board/ttcontrol/vision2/config.mk
index 59f3367cfc..952037e806 100644
--- a/board/ttcontrol/vision2/config.mk
+++ b/board/ttcontrol/vision2/config.mk
@@ -20,6 +20,6 @@
# MA 02111-1307 USA
#
-LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds
-TEXT_BASE = 0x97800000
+CONFIG_SYS_TEXT_BASE = 0x97800000
IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage_hynix.cfg
+ALL += $(obj)u-boot.imx
OpenPOWER on IntegriCloud