aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-10-03 14:58:53 +0200
committerMathias Kresin <dev@kresin.me>2017-10-04 20:08:15 +0200
commit66a0f3a39709839c1e46141f5e431974e4bd4cdf (patch)
tree90cf537aa039eb8abb8223196d6377efdeee471e /target/linux
parent77fee9bcce5cb118be6e1f8168cf5a0fe6dcf2b7 (diff)
downloadupstream-66a0f3a39709839c1e46141f5e431974e4bd4cdf.tar.gz
upstream-66a0f3a39709839c1e46141f5e431974e4bd4cdf.tar.bz2
upstream-66a0f3a39709839c1e46141f5e431974e4bd4cdf.zip
lantiq: select PCI support in subtargets
AmazonSE and Falcon do not have support for PCI and it can't be unselected in the subtarget kernel config. This way the enabled PCI support is inherit from the higher level config to the subtarget. If CONFIG_PCI is selected, PCI_SUPPORT will be autoselected as well and all packages depending on this config symbol will be build and at least some of them fail due to missing pci functions. The issue can be observed if all kmods and all non-shared packages are build. Fix the issue by enabling PCI support only in subtargets with PCI support. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/lantiq/config-4.98
-rw-r--r--target/linux/lantiq/xrx200/config-default7
-rw-r--r--target/linux/lantiq/xway/config-default8
-rw-r--r--target/linux/lantiq/xway_legacy/config-default8
4 files changed, 23 insertions, 8 deletions
diff --git a/target/linux/lantiq/config-4.9 b/target/linux/lantiq/config-4.9
index 387a1893b8..a98509e5d6 100644
--- a/target/linux/lantiq/config-4.9
+++ b/target/linux/lantiq/config-4.9
@@ -12,7 +12,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_BLK_MQ_PCI=y
CONFIG_CEVT_R4K=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_CLONE_BACKWARDS=y
@@ -151,20 +150,13 @@ CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
# CONFIG_NO_IOPORT_MAP is not set
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_GPIO=y
CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-CONFIG_PCI=y
-# CONFIG_PCIE_LANTIQ is not set
-CONFIG_PCI_DOMAINS=y
CONFIG_PCI_DRIVERS_LEGACY=y
-CONFIG_PCI_LANTIQ=y
CONFIG_PERF_USE_VMALLOC=y
CONFIG_PGTABLE_LEVELS=2
CONFIG_PHYLIB=y
diff --git a/target/linux/lantiq/xrx200/config-default b/target/linux/lantiq/xrx200/config-default
index 7b092348df..73ccaf34ab 100644
--- a/target/linux/lantiq/xrx200/config-default
+++ b/target/linux/lantiq/xrx200/config-default
@@ -1,6 +1,7 @@
CONFIG_ADM6996_PHY=y
CONFIG_AR8216_PHY=y
CONFIG_AT803X_PHY=y
+CONFIG_BLK_MQ_PCI=y
CONFIG_CPU_MIPSR2_IRQ_EI=y
CONFIG_CPU_MIPSR2_IRQ_VI=y
CONFIG_CPU_RMAP=y
@@ -48,8 +49,14 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_NET_FLOW_LIMIT=y
CONFIG_NLS=y
CONFIG_NR_CPUS=2
+CONFIG_OF_ADDRESS_PCI=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
CONFIG_PADATA=y
+CONFIG_PCI=y
CONFIG_PCIE_LANTIQ=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_LANTIQ=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_SUPPLY=y
diff --git a/target/linux/lantiq/xway/config-default b/target/linux/lantiq/xway/config-default
index fde071cebe..79064ccc02 100644
--- a/target/linux/lantiq/xway/config-default
+++ b/target/linux/lantiq/xway/config-default
@@ -1,5 +1,6 @@
CONFIG_ADM6996_PHY=y
CONFIG_AR8216_PHY=y
+CONFIG_BLK_MQ_PCI=y
CONFIG_CRC16=y
CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRYPTO_LZO=y
@@ -23,6 +24,13 @@ CONFIG_MTD_UBI_BLOCK=y
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_NLS=y
+CONFIG_OF_ADDRESS_PCI=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_PCI=y
+# CONFIG_PCIE_LANTIQ is not set
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_LANTIQ=y
CONFIG_RTL8306_PHY=y
CONFIG_RTL8366S_PHY=y
CONFIG_RTL8367B_PHY=y
diff --git a/target/linux/lantiq/xway_legacy/config-default b/target/linux/lantiq/xway_legacy/config-default
index b838106ddc..c8aa631787 100644
--- a/target/linux/lantiq/xway_legacy/config-default
+++ b/target/linux/lantiq/xway_legacy/config-default
@@ -1,5 +1,6 @@
CONFIG_ADM6996_PHY=y
CONFIG_AR8216_PHY=y
+CONFIG_BLK_MQ_PCI=y
CONFIG_CRC16=y
CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRYPTO_LZO=y
@@ -16,6 +17,13 @@ CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
# CONFIG_MTD_PHYSMAP_OF is not set
CONFIG_NLS=y
+CONFIG_OF_ADDRESS_PCI=y
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_PCI=y
+# CONFIG_PCIE_LANTIQ is not set
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_LANTIQ=y
CONFIG_RTL8306_PHY=y
CONFIG_RTL8366S_PHY=y
CONFIG_RTL8367B_PHY=y