Merge branch 'next' of git://git.denx.de/u-boot-avr32

[oweals/u-boot.git] / board / xilinx / ml507 / config.mk

diff --git a/board/xilinx/ml507/config.mk b/board/xilinx/ml507/config.mk
index 35c52ad7fd4da56551ee23f78b04ee123772bb46..e827e8a93688f6fdc2f6fa6f1247394446ef4b65 100644 (file)
--- a/board/xilinx/ml507/config.mk
+++ b/board/xilinx/ml507/config.mk
@@ -20,5 +20,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
+ifndef TEXT_BASE
 TEXT_BASE = 0x04000000
+endif