build: define CPU only when arch/${ARCH}/cpu/${CPU} exists

[people/ms/u-boot.git] / config.mk

diff --git a/config.mk b/config.mk
index 05864aabb5a99c92864161b59b2fae3fdbb16a83..bd74732d48d2bb71aae66aab3f106029bb95698a 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -24,10 +24,7 @@ OBJCOPYFLAGS :=
 # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
 # 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
+CPUDIR=arch/$(ARCH)/cpu$(if $(CPU),/$(CPU),)
 
 sinclude $(srctree)/arch/$(ARCH)/config.mk     # include architecture dependend rules
 sinclude $(srctree)/$(CPUDIR)/config.mk                # include  CPU  specific rules