summaryrefslogtreecommitdiff
path: root/config.mk
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2010-04-12 22:28:09 -0500
committerWolfgang Denk <wd@denx.de>2010-04-13 09:13:16 +0200
commit8d1f268204b07e172f3cb5cee0a3974d605b0b98 (patch)
treec3359e920cc886e7060fb099bf933496aca37153 /config.mk
parent819833af39a91fa1c1e8252862bbda6f5a602f7b (diff)
downloadu-boot-imx-8d1f268204b07e172f3cb5cee0a3974d605b0b98.zip
u-boot-imx-8d1f268204b07e172f3cb5cee0a3974d605b0b98.tar.gz
u-boot-imx-8d1f268204b07e172f3cb5cee0a3974d605b0b98.tar.bz2
ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'config.mk')
-rw-r--r--config.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/config.mk b/config.mk
index 85b524e..73b5195 100644
--- a/config.mk
+++ b/config.mk
@@ -112,7 +112,12 @@ sinclude $(OBJTREE)/include/autoconf.mk
# 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)
+# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains
+# CPU-specific code.
+CPUDIR=arch/$(ARCH)/cpu/$(CPU)
+ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
+CPUDIR=arch/$(ARCH)/cpu
+endif
sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture dependend rules
sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules