commit 8d1f268204b07e172f3cb5cee0a3974d605b0b98
author Peter Tyser <ptyser@xes-inc.com> Mon Apr 12 22:28:09 2010 -0500
committer Wolfgang Denk <wd@denx.de> Tue Apr 13 09:13:16 2010 +0200
tree c3359e920cc886e7060fb099bf933496aca37153
parent 819833af39a91fa1c1e8252862bbda6f5a602f7b

ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

config.mk

diff --git a/config.mk b/config.mk
index 85b524e..73b5195 100644
--- a/config.mk
+++ b/config.mk
@@ -112,7 +112,12 @@
 
 # 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