summaryrefslogtreecommitdiffstats
path: root/config.mk
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2010-04-12 22:28:02 -0500
committerWolfgang Denk <wd@denx.de>2010-04-13 09:12:59 +0200
commit03b7004ddafc70d83904d790abaa50843868130e (patch)
tree0f737a5d907c2d5d771d6862438f916d5c36355c /config.mk
parentfd4e49c18901a50b1648235f26da1e8caa0f8764 (diff)
downloadblackbird-obmc-uboot-03b7004ddafc70d83904d790abaa50843868130e.tar.gz
blackbird-obmc-uboot-03b7004ddafc70d83904d790abaa50843868130e.zip
Create CPUDIR variable
The CPUDIR variable points to the location of a target's CPU directory. Currently, it is set to cpu/$CPU. However, using $CPUDIR will allow for more flexibility in the future. It lays the groundwork for reorganizing U-Boot's directory structure to support a layout such as: arch/$ARCH/cpu/$CPU/* (architecture with multiple CPU types) arch/$ARCH/cpu/* (architecture with one CPU type) Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'config.mk')
-rw-r--r--config.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/config.mk b/config.mk
index cb1c4af977..c82cb63d24 100644
--- a/config.mk
+++ b/config.mk
@@ -110,14 +110,15 @@ RANLIB = $(CROSS_COMPILE)RANLIB
# Load generated board configuration
sinclude $(OBJTREE)/include/autoconf.mk
-ifdef ARCH
+# Some architecture config.mk files need to know what CPUDIR is set to,
+# so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
+CPUDIR=cpu/$(CPU)
+
sinclude $(TOPDIR)/lib_$(ARCH)/config.mk # include architecture dependend rules
-endif
-ifdef CPU
-sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules
-endif
+sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules
+
ifdef SOC
-sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules
+sinclude $(TOPDIR)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules
endif
ifdef VENDOR
BOARDDIR = $(VENDOR)/$(BOARD)
OpenPOWER on IntegriCloud