adapt profiles for subtarget changes

SVN-Revision: 8695

include/target.mk

@@ -70,13 +70,17 @@ define Profile
 	getvar "$(call shvar,Profile/$(1)/Description)"; \
 	echo "@@"; \
 	echo;
-  ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(2),$(2)_)$(1))),y)
+  ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_)$(1))),y)
     PROFILE=$(1)
   endif
 endef
 
-$(eval $(call shexport,Target/Description))
+-include $(PLATFORM_DIR)/profiles/*.mk
+ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+  -include $(PLATFORM_SUBDIR)/profiles/*.mk
+endif
 
+$(eval $(call shexport,Target/Description))
 
 include $(INCLUDE_DIR)/kernel-version.mk
 

target/linux/amazon/Makefile

@@ -20,7 +20,4 @@ endef
 
 KERNELNAME:="uImage"
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/amcc/Makefile

@@ -19,7 +19,4 @@ define Target/Description
 	Build firmware images for the AMCC Taishan evaluation board
 endef
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/ar7/Makefile

@@ -19,6 +19,4 @@ define Target/Description
 	Build firmware images for TI AR7 based routers
 endef
 
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/at91/Makefile

@@ -22,7 +22,4 @@ define Target/Description
   Build fimware images for Figment Design Labs VersaLink board.
 endef
 
-#include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/atheros/Makefile

@@ -21,7 +21,4 @@ define Target/Description
 	Build firmware images for Atheros SoC boards
 endef
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/au1000/Makefile

@@ -27,8 +27,5 @@ define Kernel/BuildImage
 	$(CP) $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.srec $(LINUX_DIR)/zImage.srec
 endef
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))
 

target/linux/avr32/Makefile

@@ -18,7 +18,4 @@ define Target/Description
   Build firmware images for ATNGW100 board
 endef
 
-#include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/brcm-2.4/Makefile

@@ -22,7 +22,4 @@ define Target/Description
 	(e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
 endef
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/brcm47xx/Makefile

@@ -21,7 +21,4 @@ define Target/Description
 	(e.g. Netgear WGT634U)
 endef
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/brcm63xx/Makefile

@@ -19,7 +19,4 @@ define Target/Description
 	(e.g. Inventel Livebox, Siemens SE515)
 endef
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/etrax/Makefile

@@ -34,9 +34,6 @@ define Kernel/Prepare
 	$(call Kernel/Prepare/Fox)
 endef
 
-#include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))
 $(eval $(call RequireCommand,/usr/local/cris/gcc-cris, \
 	Please install the binary cris toolchain. \

target/linux/iop32x/Makefile

@@ -15,7 +15,4 @@ LINUX_VERSION:=2.6.21.5
 
 include $(INCLUDE_DIR)/target.mk
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/ixp4xx/Makefile

@@ -15,7 +15,4 @@ LINUX_VERSION:=2.6.21.6
 
 include $(INCLUDE_DIR)/target.mk
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/magicbox/Makefile

@@ -15,7 +15,4 @@ LINUX_VERSION:=2.6.22.4
 
 include $(INCLUDE_DIR)/target.mk
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/pxa/Makefile

@@ -19,7 +19,4 @@ define Target/Description
 	Stub for boards based on intel PXA
 endef
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/rb532/Makefile

@@ -15,7 +15,4 @@ LINUX_VERSION:=2.6.22.4
 
 include $(INCLUDE_DIR)/target.mk
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/rdc/Makefile

@@ -32,7 +32,4 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
   endef
 endif
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/sibyte/Makefile

@@ -15,7 +15,4 @@ LINUX_VERSION:=2.6.21.5
 
 include $(INCLUDE_DIR)/target.mk
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))

target/linux/uml/Makefile

@@ -27,9 +27,6 @@ LINUX_VERSION:=2.6.22.4
 
 include $(INCLUDE_DIR)/target.mk
 
-# include the profiles
--include profiles/*.mk
-
 endif
 
 $(eval $(call BuildTarget))

target/linux/x86/Makefile

@@ -16,8 +16,5 @@ LINUX_VERSION:=2.6.22.4
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
 
-# include the profiles
--include profiles/*.mk
-
 $(eval $(call BuildTarget))