summaryrefslogtreecommitdiffstats
path: root/board/tqm5200/config.mk
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-08-07 23:21:52 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-08-07 23:21:52 +0200
commit98280e3d431db77d92219438b8840853bd7cb412 (patch)
treef771fe8d5086d32cda26a0b8d16f9b95e761838e /board/tqm5200/config.mk
parent99d70e3a47affb9bae041a2caece7cd516e213b3 (diff)
parent6587f7e1e98bfcb7910a47bae2eb51e9a5fbd4da (diff)
downloadblackbird-obmc-uboot-98280e3d431db77d92219438b8840853bd7cb412.tar.gz
blackbird-obmc-uboot-98280e3d431db77d92219438b8840853bd7cb412.zip
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/tqm5200/config.mk')
-rw-r--r--board/tqm5200/config.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/board/tqm5200/config.mk b/board/tqm5200/config.mk
index 585a99a8c7..84ddee80d9 100644
--- a/board/tqm5200/config.mk
+++ b/board/tqm5200/config.mk
@@ -28,12 +28,17 @@
#
# 0xFC000000 boot low (standard configuration with room for max 64 MByte
# Flash ROM)
+# 0xFFF00000 boot high (for a backup copy of U-Boot)
# 0x00100000 boot from RAM (for testing only)
#
+sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+
ifndef TEXT_BASE
## Standard: boot low
TEXT_BASE = 0xFC000000
+## For a backup copy of U-Boot at the end of flash: boot high
+# TEXT_BASE = 0xFFF00000
## For testing: boot from RAM
# TEXT_BASE = 0x00100000
endif
OpenPOWER on IntegriCloud