summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-14 13:55:30 +0200
committerWolfgang Denk <wd@denx.de>2008-05-14 14:02:14 +0200
commitcda2a4a9961fd4341b7db305cb22fc05957e8b77 (patch)
treecc1008f04a83bcec6639d4f1042a27f464b3ec6d
parentfdd1247a66d788a3446244f6fde9955a93c26322 (diff)
Fix config files for out-of-tree building
Several board/<...>/config.mk files include dynamically built (by the Makefile) config files but used the wrong file name of $(TOPDIR)/board/$(BOARDDIR)/config.tmp instead if the correct $(OBJTREE)/board/$(BOARDDIR)/config.tmp The bug is nasty because the build result is correct for the (normal) in-tree builds, and because 'sinclude' is used no errors get raised even for out-of-tree build tests. But out-of-tree builds use an incomplete and thus usually incorrect configuration... Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--board/BuS/EB+MCF-EV123/config.mk2
-rw-r--r--board/amcc/canyonlands/config.mk2
-rw-r--r--board/esd/mecp5200/config.mk2
-rw-r--r--board/linkstation/config.mk2
-rw-r--r--board/munices/config.mk2
-rw-r--r--board/v38b/config.mk2
6 files changed, 6 insertions, 6 deletions
diff --git a/board/BuS/EB+MCF-EV123/config.mk b/board/BuS/EB+MCF-EV123/config.mk
index 9fe2fc5dae6..f03e3962d0f 100644
--- a/board/BuS/EB+MCF-EV123/config.mk
+++ b/board/BuS/EB+MCF-EV123/config.mk
@@ -22,7 +22,7 @@
# MA 02111-1307 USA
#
-sinclude $(TOPDIR)/board/$(BOARDDIR)/textbase.mk
+sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk
ifndef TEXT_BASE
TEXT_BASE = 0xFE000000
endif
diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk
index 1e4bbc47e68..7e795367981 100644
--- a/board/amcc/canyonlands/config.mk
+++ b/board/amcc/canyonlands/config.mk
@@ -24,7 +24,7 @@
# AMCC 460EX/460GT Evaluation Board (Canyonlands) board
#
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE
TEXT_BASE = 0xFFFA0000
diff --git a/board/esd/mecp5200/config.mk b/board/esd/mecp5200/config.mk
index 07b5de1881c..170779d6c14 100644
--- 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
diff --git a/board/linkstation/config.mk b/board/linkstation/config.mk
index bdf611dc2b0..d04829014ee 100644
--- a/board/linkstation/config.mk
+++ b/board/linkstation/config.mk
@@ -35,7 +35,7 @@
# 0x07F00000 boot from RAM
#
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE
# For flash image - all models
diff --git a/board/munices/config.mk b/board/munices/config.mk
index d226244a1c3..1b573bc882b 100644
--- a/board/munices/config.mk
+++ b/board/munices/config.mk
@@ -29,7 +29,7 @@
# 0xFFF00000 boot high (standard configuration)
#
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE
TEXT_BASE = 0xFFF00000
diff --git a/board/v38b/config.mk b/board/v38b/config.mk
index 75577fcbec7..bc55fc7b29a 100644
--- a/board/v38b/config.mk
+++ b/board/v38b/config.mk
@@ -25,7 +25,7 @@
# MarelV38B board
#
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
TEXT_BASE = 0xFF000000