From 72197b18bc0e86feba7cc9f907551e30948bd526 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Wed, 4 Mar 2009 16:21:31 +0100 Subject: xtensa: variant-specific code Allow the variant to provide real code. Add empty dummy Makefiles for the existing variants. Signed-off-by: Johannes Weiner Signed-off-by: Chris Zankel --- arch/xtensa/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/xtensa/Makefile') diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 1da55fe4bef..6d7f60e6d55 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -68,6 +68,9 @@ 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 -- cgit v1.2.3 From 000af2c5a8913ebd763313d0c9ebc66c2c4765b1 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Wed, 4 Mar 2009 16:21:32 +0100 Subject: xtensa: s6000 variant Support for the Stretch S6000 Xtensa core variant. Signed-off-by: Johannes Weiner Signed-off-by: Oskar Schirmer Signed-off-by: Chris Zankel --- arch/xtensa/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/xtensa/Makefile') diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 6d7f60e6d55..8f97a86041a 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -15,6 +15,7 @@ variant-$(CONFIG_XTENSA_VARIANT_FSF) := fsf variant-$(CONFIG_XTENSA_VARIANT_DC232B) := dc232b +variant-$(CONFIG_XTENSA_VARIANT_S6000) := s6000 variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom VARIANT = $(variant-y) -- cgit v1.2.3 From f82e939fb75ad01da8f0d3024fc678111ddb4ac7 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Wed, 4 Mar 2009 16:21:33 +0100 Subject: xtensa: platform: s6105 Support for the S6105 IP Camera Reference Design Kit. Signed-off-by: Johannes Weiner Signed-off-by: Oskar Schirmer Signed-off-by: Chris Zankel --- arch/xtensa/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/xtensa/Makefile') diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 8f97a86041a..d0a8ba4b12c 100644 --- 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 -- cgit v1.2.3 From f1933189b89da2b34fc37e6737737c8c9bf01139 Mon Sep 17 00:00:00 2001 From: Chris Zankel Date: Thu, 2 Apr 2009 16:58:53 -0700 Subject: 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 --- arch/xtensa/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'arch/xtensa/Makefile') diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index d0a8ba4b12c..4caffac3ca2 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 -- cgit v1.2.3