autodetect atm, pci, usb, pcmcia features from kernel config file

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5586 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 4967dfb67e1f045ae1f0bd6a841ebd020dd2f1fc..8462319f0ab4ec9d672a4cbf6c9f77d7a9629753 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -8,6 +8,23 @@ KERNEL_BUILD:=1
 
 include $(INCLUDE_DIR)/prereq.mk
 
+-include ./config
+ifneq ($(CONFIG_ATM),)
+  FEATURES += atm
+endif
+ifneq ($(CONFIG_PCI),)
+  FEATURES += pci
+endif
+ifneq ($(CONFIG_USB),)
+  FEATURES += usb
+endif
+ifneq ($(CONFIG_PCMCIA),)
+  FEATURES += pcmcia
+endif
+
+# remove duplicates
+FEATURES:=$(sort $(FEATURES))
+
 # For target profile selection - the default set
 DEFAULT_PACKAGES:=base-files libgcc uclibc bridge busybox dnsmasq dropbear iptables mtd ppp ppp-mod-pppoe mtd
 

diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile
index df29ef269c59b2e4bce6295588963783ef5713ac..f59343756f0fe902d54e1dc1b8c70024c9830d04 100644 (file)
--- a/target/linux/ar7-2.4/Makefile
+++ b/target/linux/ar7-2.4/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=ar7
 BOARDNAME:=TI AR7
-FEATURES:=atm squashfs jffs2
+FEATURES:=squashfs jffs2
 
 define Target/Description
        Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)

diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile
index 423e1e762b4f3e6d06aa36ebf91ef976fd90ffd9..e852adea10f4fd8e81f85067d82a2cbcf2aec2e7 100644 (file)
--- a/target/linux/aruba-2.6/Makefile
+++ b/target/linux/aruba-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mips
 BOARD:=aruba
 BOARDNAME:=Aruba
-FEATURES:=jffs2 pci usb
+FEATURES:=jffs2
 
 define Target/Description
        Build firmware images for Aruba boards

diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile
index 7b36c339acc479b2f65c511cd005af0c75f2202e..258990f8b76eb9fa4a0a2d54b89e84ef1f16e15c 100644 (file)
--- a/target/linux/au1000-2.6/Makefile
+++ b/target/linux/au1000-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=au1000
 BOARDNAME:=AMD Alchemy AU1x00
-FEATURES:=pci usb jffs2
+FEATURES:=jffs2
 
 define Target/Description
        Build firmware for AMD Alchemy 1500 boards

diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index 449219adb9962233a7c138a86edf060c45f77578..36160cf418b7aa26379ce3cf89395f9c0e8d65fd 100644 (file)
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=brcm
 BOARDNAME:=Broadcom BCM947xx/953xx
-FEATURES:=pci usb pcmcia squashfs jffs2
+FEATURES:=squashfs jffs2
 
 define Target/Description
        Build firmware images for Broadcom based routers

diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile
index 960c29789a60c98d33c182d182bbf4d57df8a45a..7de48ac2a6f4ff88b7154bed25235b91868df8f1 100644 (file)
--- a/target/linux/brcm-2.6/Makefile
+++ b/target/linux/brcm-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=brcm
 BOARDNAME:=Broadcom BCM947xx/953xx
-FEATURES:=pci usb pcmcia squashfs jffs2
+FEATURES:=squashfs jffs2
 
 define Target/Description
        Build firmware images for Broadcom based routers

diff --git a/target/linux/brcm63xx-2.6/Makefile b/target/linux/brcm63xx-2.6/Makefile
index 7e61c731bae9dc519fedef9b52f38bbdad92be5f..70ff003ddd90e4e649a1dbca44bf391b0b04139b 100644 (file)
--- a/target/linux/brcm63xx-2.6/Makefile
+++ b/target/linux/brcm63xx-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mips
 BOARD:=brcm63xx
 BOARDNAME:=Broadcom BCM963xx
-FEATURES:=pci usb atm squashfs jffs2
+FEATURES:=squashfs jffs2
 
 define Target/Description
        Build firmware images for Broadcom based xDSL/routers

diff --git a/target/linux/ixp4xx-2.6/Makefile b/target/linux/ixp4xx-2.6/Makefile
index 86df91fd8280c2f5f9a8afe6f04fc36f32b470ef..0156414b1123e7fea3a3e13254c21546d649e864 100644 (file)
--- a/target/linux/ixp4xx-2.6/Makefile
+++ b/target/linux/ixp4xx-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=ixp4xx
 BOARDNAME:=Intel XScale IXP4xx
-FEATURES:=pci usb jffs2
+FEATURES:=jffs2
 
 define Target/Description
 endef

diff --git a/target/linux/magicbox-2.6/Makefile b/target/linux/magicbox-2.6/Makefile
index d51c8e483bbcbc5349e1ba875f61d811fac607c1..5e36e82c42d0d38df855f0141b0969ffe3d01414 100644 (file)
--- a/target/linux/magicbox-2.6/Makefile
+++ b/target/linux/magicbox-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=powerpc
 BOARD:=magicbox
 BOARDNAME:=Magicbox
-FEATURES:=pci jffs2
+FEATURES:=jffs2
 
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1

diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile
index 35c4f6d6facc46f325da552654eaed85786359b8..e59b32cd8baadcb3c1bd06baf10ea6d205c3a7cb 100644 (file)
--- a/target/linux/rb532-2.6/Makefile
+++ b/target/linux/rb532-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=rb532
 BOARDNAME:=Mikrotik RouterBoard 532
-FEATURES:=pci jffs2
+FEATURES:=jffs2
 
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1

diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile
index 10a4872ac66605c9851a98a9a9c5bba53924d85a..3d48de7f5d73eb7fa6bc6ed3d81b5804a28f1caa 100644 (file)
--- a/target/linux/rdc-2.6/Makefile
+++ b/target/linux/rdc-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=i386
 BOARD:=rdc
 BOARDNAME:=RDC x86
-FEATURES:=broken pci jffs2
+FEATURES:=broken jffs2
 
 define Target/Description
         Build firmware images for RDC3211 based routers

diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index 8676aab8cfa2411e980601831b90e8bcd5b5c1cc..1c61bd3195427409ec2d74ecfb76d3d0b9accf2f 100644 (file)
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH=i386
 BOARD:=x86
 BOARDNAME:=x86
-FEATURES:=pci usb atm pcmcia jffs2 ext2
+FEATURES:=jffs2 ext2
 
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1