From: Chris Zankel <chris@zankel.net>
Date: Thu, 2 Apr 2009 23:58:53 +0000 (-0700)
Subject: xtensa: only build platform or variant if they contain a Makefile
X-Git-Tag: v2.6.30-rc1~221^2~2
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=f1933189b89da2b34fc37e6737737c8c9bf01139;p=safe%2Fjmp%2Flinux-2.6

xtensa: only build platform or variant if they contain a Makefile

We only add the platform or variant directory to core-y if it
contains a Makefile. Consequently, we can remove the Makefiles
for the dc232b and fsf processor variants.

Signed-off-by: Chris Zankel <chris@zankel.net>
---

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index d0a8ba4..4caffac 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -64,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
diff --git a/arch/xtensa/variants/dc232b/Makefile b/arch/xtensa/variants/dc232b/Makefile
deleted file mode 100644
index 3c8f268..0000000
--- a/arch/xtensa/variants/dc232b/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-# dc232b Makefile
diff --git a/arch/xtensa/variants/fsf/Makefile b/arch/xtensa/variants/fsf/Makefile
deleted file mode 100644
index 3fadcfd..0000000
--- a/arch/xtensa/variants/fsf/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-# fsf Makefile