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>
This commit is contained in:
parent
fdd1247a66
commit
cda2a4a996
|
@ -22,7 +22,7 @@
|
||||||
# MA 02111-1307 USA
|
# MA 02111-1307 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
sinclude $(TOPDIR)/board/$(BOARDDIR)/textbase.mk
|
sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk
|
||||||
ifndef TEXT_BASE
|
ifndef TEXT_BASE
|
||||||
TEXT_BASE = 0xFE000000
|
TEXT_BASE = 0xFE000000
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
# AMCC 460EX/460GT Evaluation Board (Canyonlands) board
|
# AMCC 460EX/460GT Evaluation Board (Canyonlands) board
|
||||||
#
|
#
|
||||||
|
|
||||||
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
|
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
|
||||||
|
|
||||||
ifndef TEXT_BASE
|
ifndef TEXT_BASE
|
||||||
TEXT_BASE = 0xFFFA0000
|
TEXT_BASE = 0xFFFA0000
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
# 0x00100000 boot from RAM (for testing only)
|
# 0x00100000 boot from RAM (for testing only)
|
||||||
#
|
#
|
||||||
|
|
||||||
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
|
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
|
||||||
|
|
||||||
ifndef TEXT_BASE
|
ifndef TEXT_BASE
|
||||||
## Standard: boot high
|
## Standard: boot high
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
# 0x07F00000 boot from RAM
|
# 0x07F00000 boot from RAM
|
||||||
#
|
#
|
||||||
|
|
||||||
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
|
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
|
||||||
|
|
||||||
ifndef TEXT_BASE
|
ifndef TEXT_BASE
|
||||||
# For flash image - all models
|
# For flash image - all models
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
# 0xFFF00000 boot high (standard configuration)
|
# 0xFFF00000 boot high (standard configuration)
|
||||||
#
|
#
|
||||||
|
|
||||||
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
|
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
|
||||||
|
|
||||||
ifndef TEXT_BASE
|
ifndef TEXT_BASE
|
||||||
TEXT_BASE = 0xFFF00000
|
TEXT_BASE = 0xFFF00000
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
# MarelV38B board
|
# MarelV38B board
|
||||||
#
|
#
|
||||||
|
|
||||||
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
|
sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
|
||||||
|
|
||||||
TEXT_BASE = 0xFF000000
|
TEXT_BASE = 0xFF000000
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue