Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[karo-tx-linux.git] / arch / xtensa / Makefile

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 8f97a86041ad6a670e4035cea279afda1ed8b21f..4caffac3ca2e7d3805bb6d1b8fd11b53bdc544d0 100644 (file)
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -25,6 +25,7 @@ export VARIANT
 
 platform-$(CONFIG_XTENSA_PLATFORM_XT2000)      := xt2000
 platform-$(CONFIG_XTENSA_PLATFORM_ISS)         := iss
+platform-$(CONFIG_XTENSA_PLATFORM_S6105)       := s6105
 
 PLATFORM = $(platform-y)
 export PLATFORM
@@ -63,23 +64,23 @@ ifneq ($(VARIANT),)
   endif
 endif
 
-#
+# Only build variant and/or platform if it includes a Makefile
+
+buildvar := $(shell test -a $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/)
+buildplf := $(shell test -a $(srctree)/arch/xtensa/platforms/$(PLATFORM)/Makefile && echo arch/xtensa/platforms/$(PLATFORM)/)
+
+# Find libgcc.a
 
 LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 head-y         := arch/xtensa/kernel/head.o
 core-y         += arch/xtensa/kernel/ arch/xtensa/mm/
-ifneq ($(VARIANT),)
-core-y         += arch/xtensa/variants/$(VARIANT)/
-endif
-ifneq ($(PLATFORM),)
-core-y         += arch/xtensa/platforms/$(PLATFORM)/
-endif
+core-y         += $(buildvar) $(buildplf)
+
 libs-y         += arch/xtensa/lib/ $(LIBGCC)
 
 boot           := arch/xtensa/boot
 
-
 all: zImage
 
 bzImage : zImage