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
SVN-Revision: 11097
This commit is contained in:
parent
9b3eedabdb
commit
e3a42b23c6
22 changed files with 36 additions and 13 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue