From ab01217894a54a088699f346a50908b0f3fc60fc Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 9 May 2008 17:08:51 +0000 Subject: [PATCH] enable proper PCI & USB support detection at config-time by disabling CONFIG_PCI & CONFIG_USB entries in generic/config and enabling them on targets where appropriate git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11097 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/adm5120/router_be/config-default | 2 ++ target/linux/adm5120/router_le/config-default | 2 ++ target/linux/au1000/config-2.6.24 | 2 ++ target/linux/brcm47xx/config-2.6.23 | 2 ++ target/linux/brcm63xx/config-2.6.24 | 2 ++ target/linux/brcm63xx/image/Makefile | 2 -- target/linux/generic-2.6/config-2.6.23 | 4 ++-- target/linux/generic-2.6/config-2.6.24 | 4 ++-- target/linux/generic-2.6/config-2.6.25 | 4 ++-- target/linux/ifxmips/config-2.6.25 | 2 ++ target/linux/iop32x/config-default | 2 ++ target/linux/ixp4xx/config-default | 2 ++ target/linux/magicbox/config-default | 2 +- target/linux/olpc/config-2.6.23 | 1 + target/linux/ppc40x/config-default | 2 +- target/linux/ppc44x/config-default | 2 +- target/linux/rb532/config-2.6.23 | 3 ++- target/linux/rdc/config-2.6.24 | 2 ++ target/linux/sibyte/config-default | 2 +- target/linux/storm/config-default | 1 + target/linux/x86/config-2.6.24 | 2 ++ target/linux/x86/config-2.6.25 | 2 ++ 22 files changed, 36 insertions(+), 13 deletions(-) diff --git a/target/linux/adm5120/router_be/config-default b/target/linux/adm5120/router_be/config-default index 340dc6a50..c1d3d699b 100644 --- a/target/linux/adm5120/router_be/config-default +++ b/target/linux/adm5120/router_be/config-default @@ -186,6 +186,7 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_ADM5120=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y @@ -243,6 +244,7 @@ CONFIG_TMPFS_POSIX_ACL=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m # CONFIG_USB_ACM is not set CONFIG_USB_ADM5120_HCD=m # CONFIG_USB_ATM is not set diff --git a/target/linux/adm5120/router_le/config-default b/target/linux/adm5120/router_le/config-default index a65a0f11d..ea84c137b 100644 --- a/target/linux/adm5120/router_le/config-default +++ b/target/linux/adm5120/router_le/config-default @@ -194,6 +194,7 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_ADM5120=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y @@ -250,6 +251,7 @@ CONFIG_TMPFS_POSIX_ACL=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m CONFIG_USB_ADM5120_HCD=m # CONFIG_USB_ALI_M5632 is not set # CONFIG_USB_AN2720 is not set diff --git a/target/linux/au1000/config-2.6.24 b/target/linux/au1000/config-2.6.24 index c731afe23..85e223785 100644 --- a/target/linux/au1000/config-2.6.24 +++ b/target/linux/au1000/config-2.6.24 @@ -186,6 +186,7 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PHYLIB=y # CONFIG_PMC_MSP is not set @@ -246,6 +247,7 @@ CONFIG_TICK_ONESHOT=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m CONFIG_USB_EHCI_HCD=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/target/linux/brcm47xx/config-2.6.23 b/target/linux/brcm47xx/config-2.6.23 index 4d145bddf..41b440b44 100644 --- a/target/linux/brcm47xx/config-2.6.23 +++ b/target/linux/brcm47xx/config-2.6.23 @@ -162,6 +162,7 @@ CONFIG_NETDEV_1000=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set +CONFIG_PCI=y # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set @@ -216,6 +217,7 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y +CONFIG_USB=m # CONFIG_USB_CATC is not set CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y diff --git a/target/linux/brcm63xx/config-2.6.24 b/target/linux/brcm63xx/config-2.6.24 index 179d32278..92c4a4f0a 100644 --- a/target/linux/brcm63xx/config-2.6.24 +++ b/target/linux/brcm63xx/config-2.6.24 @@ -214,6 +214,7 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set CONFIG_PCCARD=m CONFIG_PCCARD_NONSTATIC=m +CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PHYLIB=m # CONFIG_PMC_MSP is not set @@ -283,6 +284,7 @@ CONFIG_TIPC=m # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y +CONFIG_USB=m # CONFIG_USB_EHCI_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_SERIAL_CH341 is not set diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index fab73efd2..16c57cae4 100644 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -45,9 +45,7 @@ define Image/Prepare endef define Image/Build -ifneq($(1),ext2) $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1) -endif endef $(eval $(call BuildImage)) diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23 index 418a1dd00..b2860f9ce 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -1005,7 +1005,7 @@ CONFIG_PATA_PLATFORM=m # CONFIG_PATA_WINBOND_VLB is not set # CONFIG_PC300TOO is not set # CONFIG_PCCARD is not set -CONFIG_PCI=y +# CONFIG_PCI is not set # CONFIG_PCI_ATMEL is not set CONFIG_PCI_HERMES=m # CONFIG_PCMCIA is not set @@ -1463,7 +1463,7 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_UNUSED_SYMBOLS is not set -CONFIG_USB=m +# CONFIG_USB is not set # CONFIG_USB_ACECAD is not set CONFIG_USB_ACM=m # CONFIG_USB_ADUTUX is not set diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24 index a0e7beccc..579df9fbd 100644 --- a/target/linux/generic-2.6/config-2.6.24 +++ b/target/linux/generic-2.6/config-2.6.24 @@ -1032,7 +1032,7 @@ CONFIG_PATA_PLATFORM=m # CONFIG_PATA_WINBOND_VLB is not set # CONFIG_PC300TOO is not set # CONFIG_PCCARD is not set -CONFIG_PCI=y +# CONFIG_PCI is not set # CONFIG_PCI_ATMEL is not set CONFIG_PCI_HERMES=m # CONFIG_PCI_LEGACY is not set @@ -1509,7 +1509,7 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_UNUSED_SYMBOLS is not set -CONFIG_USB=m +# CONFIG_USB is not set # CONFIG_USB_ACECAD is not set CONFIG_USB_ACM=m # CONFIG_USB_ADUTUX is not set diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index 07a489559..a0c893aa5 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -1053,7 +1053,7 @@ CONFIG_PATA_PLATFORM=m # CONFIG_PC300TOO is not set # CONFIG_PCCARD is not set # CONFIG_PCF8575 is not set -CONFIG_PCI=y +# CONFIG_PCI is not set # CONFIG_PCI_ATMEL is not set CONFIG_PCI_HERMES=m # CONFIG_PCI_LEGACY is not set @@ -1541,7 +1541,7 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_UNUSED_SYMBOLS is not set -CONFIG_USB=m +# CONFIG_USB is not set # CONFIG_USB_ACECAD is not set CONFIG_USB_ACM=m # CONFIG_USB_ADUTUX is not set diff --git a/target/linux/ifxmips/config-2.6.25 b/target/linux/ifxmips/config-2.6.25 index eb7cd3a04..86cd15d47 100644 --- a/target/linux/ifxmips/config-2.6.25 +++ b/target/linux/ifxmips/config-2.6.25 @@ -158,6 +158,7 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_DOMAINS=y # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set @@ -202,6 +203,7 @@ CONFIG_TICK_ONESHOT=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m # CONFIG_USB_EHCI_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_SERIAL_OTI6858 is not set diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default index aadbe77a6..58b99445a 100644 --- a/target/linux/iop32x/config-default +++ b/target/linux/iop32x/config-default @@ -296,6 +296,7 @@ CONFIG_PATA_ARTOP=m # CONFIG_PCCARD is not set # CONFIG_PCI200SYN is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y # CONFIG_PDC_ADMA is not set CONFIG_PLAT_IOP=y # CONFIG_PM is not set @@ -424,6 +425,7 @@ CONFIG_TINY_SHMEM=y CONFIG_UID16=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m # CONFIG_USB_ACM is not set CONFIG_USB_BANDWIDTH=y # CONFIG_USB_CATC is not set diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default index 12905947f..2c459caed 100644 --- a/target/linux/ixp4xx/config-default +++ b/target/linux/ixp4xx/config-default @@ -341,6 +341,7 @@ CONFIG_PATA_IXP4XX_CF=m # CONFIG_PCCARD is not set # CONFIG_PCI200SYN is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y # CONFIG_PDC_ADMA is not set # CONFIG_PM is not set CONFIG_PPP=m @@ -471,6 +472,7 @@ CONFIG_TINY_SHMEM=y CONFIG_UID16=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m CONFIG_USB_BANDWIDTH=y CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/target/linux/magicbox/config-default b/target/linux/magicbox/config-default index b2029e788..cb43f3434 100644 --- a/target/linux/magicbox/config-default +++ b/target/linux/magicbox/config-default @@ -136,6 +136,7 @@ CONFIG_MTD_PHYSMAP_START=0xffc00000 CONFIG_NOT_COHERENT_CACHE=y # CONFIG_NVRAM is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_DOMAINS=y # CONFIG_PC_KEYBOARD is not set # CONFIG_PM is not set @@ -165,7 +166,6 @@ CONFIG_TASK_SIZE=0x80000000 CONFIG_UART0_TTYS0=y # CONFIG_UART0_TTYS1 is not set # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_USB is not set # CONFIG_USER_NS is not set # CONFIG_VIA_RHINE is not set # CONFIG_WALNUT is not set diff --git a/target/linux/olpc/config-2.6.23 b/target/linux/olpc/config-2.6.23 index a0113db20..6d566c42b 100644 --- a/target/linux/olpc/config-2.6.23 +++ b/target/linux/olpc/config-2.6.23 @@ -441,6 +441,7 @@ CONFIG_PC8736x_GPIO=m # CONFIG_PC87413_WDT is not set # CONFIG_PCIEPORTBUS is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_DIRECT=y # CONFIG_PCI_GOANY is not set # CONFIG_PCI_GOBIOS is not set diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default index f777bcfd1..74e2c9f08 100644 --- a/target/linux/ppc40x/config-default +++ b/target/linux/ppc40x/config-default @@ -144,6 +144,7 @@ CONFIG_OF_DEVICE=y CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y CONFIG_PCI_SYSCALL=y @@ -194,7 +195,6 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_TASK_SIZE=0xc0000000 CONFIG_TICK_ONESHOT=y # CONFIG_TIGON3 is not set -# CONFIG_USB is not set # CONFIG_USER_NS is not set # CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default index f183106e6..e11c4ecbc 100644 --- a/target/linux/ppc44x/config-default +++ b/target/linux/ppc44x/config-default @@ -119,6 +119,7 @@ CONFIG_NOT_COHERENT_CACHE=y # CONFIG_OCOTEA is not set # CONFIG_PCIEPORTBUS is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_DOMAINS=y # CONFIG_PC_KEYBOARD is not set CONFIG_PHYS_64BIT=y @@ -159,7 +160,6 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_TAISHAN=y CONFIG_TASK_SIZE=0x80000000 # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_USB is not set # CONFIG_USER_NS is not set # CONFIG_VIA_RHINE is not set CONFIG_WANT_EARLY_SERIAL=y diff --git a/target/linux/rb532/config-2.6.23 b/target/linux/rb532/config-2.6.23 index 8cf29617d..fcfd6103a 100644 --- a/target/linux/rb532/config-2.6.23 +++ b/target/linux/rb532/config-2.6.23 @@ -142,6 +142,7 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set @@ -178,7 +179,7 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y -# CONFIG_USB is not set +CONFIG_USB=m # CONFIG_USER_NS is not set # CONFIG_VGASTATE is not set CONFIG_VIA_RHINE=y diff --git a/target/linux/rdc/config-2.6.24 b/target/linux/rdc/config-2.6.24 index 71acb2610..7ee25b558 100644 --- a/target/linux/rdc/config-2.6.24 +++ b/target/linux/rdc/config-2.6.24 @@ -231,6 +231,7 @@ CONFIG_PCCARD=m CONFIG_PCCARD_NONSTATIC=m # CONFIG_PCIEPORTBUS is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_DOMAINS=y @@ -280,6 +281,7 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TOSHIBA is not set CONFIG_UID16=y # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m CONFIG_USB_EHCI_HCD=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default index 6f628f7e7..9e6252323 100644 --- a/target/linux/sibyte/config-default +++ b/target/linux/sibyte/config-default @@ -203,6 +203,7 @@ CONFIG_NETDEV_1000=y CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_8KB is not set +CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PHYLIB=y # CONFIG_PMC_MSP is not set @@ -281,7 +282,6 @@ CONFIG_TICK_ONESHOT=y # CONFIG_TOSHIBA_JMR3927 is not set # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set -# CONFIG_USB is not set # CONFIG_USER_NS is not set # CONFIG_VGASTATE is not set # CONFIG_WATCHDOG is not set diff --git a/target/linux/storm/config-default b/target/linux/storm/config-default index 043d5fe75..f74bfc4bd 100644 --- a/target/linux/storm/config-default +++ b/target/linux/storm/config-default @@ -304,6 +304,7 @@ CONFIG_NETFILTER_XTABLES=m CONFIG_PACKET=m # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_SYSCALL=y # CONFIG_PPP is not set diff --git a/target/linux/x86/config-2.6.24 b/target/linux/x86/config-2.6.24 index 94e89e5bf..dbc658faf 100644 --- a/target/linux/x86/config-2.6.24 +++ b/target/linux/x86/config-2.6.24 @@ -287,6 +287,7 @@ CONFIG_PCCARD=m CONFIG_PCCARD_NONSTATIC=m # CONFIG_PCIEPORTBUS is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_DOMAINS=y @@ -384,6 +385,7 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TYPHOON is not set CONFIG_UID16=y # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y # CONFIG_USB_NET_DM9601 is not set diff --git a/target/linux/x86/config-2.6.25 b/target/linux/x86/config-2.6.25 index 51dda3827..de9404d13 100644 --- a/target/linux/x86/config-2.6.25 +++ b/target/linux/x86/config-2.6.25 @@ -320,6 +320,7 @@ CONFIG_PCCARD=m CONFIG_PCCARD_NONSTATIC=m # CONFIG_PCIEPORTBUS is not set # CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_DOMAINS=y @@ -415,6 +416,7 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TYPHOON is not set CONFIG_UID16=y # CONFIG_USBPCWATCHDOG is not set +CONFIG_USB=m CONFIG_USB_EHCI_HCD=m # CONFIG_USB_NET_DM9601 is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set