Merge remote branch 'origin/master' into next

[u-boot] / board / esd / mecp5200 / config.mk

diff --git a/board/esd/mecp5200/config.mk b/board/esd/mecp5200/config.mk
index 07b5de1881cc34f71ddec987c09591a950ec88bb..170779d6c143485b193741c7f7d873c1c4b57360 100644 (file)
--- a/board/esd/mecp5200/config.mk
+++ b/board/esd/mecp5200/config.mk
@@ -32,7 +32,7 @@
 #      0x00100000   boot from RAM (for testing only)
 #
 
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 ifndef TEXT_BASE
 ## Standard: boot high