From cda2a4a9961fd4341b7db305cb22fc05957e8b77 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 14 May 2008 13:55:30 +0200 Subject: [PATCH] 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 --- board/BuS/EB+MCF-EV123/config.mk | 2 +- board/amcc/canyonlands/config.mk | 2 +- board/esd/mecp5200/config.mk | 2 +- board/linkstation/config.mk | 2 +- board/munices/config.mk | 2 +- board/v38b/config.mk | 2 +- 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 9fe2fc5dae..f03e3962d0 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 1e4bbc47e6..7e79536798 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 07b5de1881..170779d6c1 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 bdf611dc2b..d04829014e 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 d226244a1c..1b573bc882 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 75577fcbec..bc55fc7b29 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 -- 2.39.5