---

yaml --- r: 140363 b: refs/heads/master c: f193318 h: refs/heads/master i: 140361: 89d6ce9 140359: 1a54e32 v: v3
git-mirror · Apr 3, 2009 · c39a208 · c39a208
1 parent 77f391d
commit c39a208
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06a7476be78c58a5ee0f4b4cc4acf43800087d52
+refs/heads/master: f1933189b89da2b34fc37e6737737c8c9bf01139
diff --git a/trunk/arch/xtensa/Makefile b/trunk/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/trunk/arch/xtensa/variants/dc232b/Makefile b/trunk/arch/xtensa/variants/dc232b/Makefile
diff --git a/trunk/arch/xtensa/variants/fsf/Makefile b/trunk/arch/xtensa/variants/fsf/Makefile