aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-08 12:03:15 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-08 13:45:36 +0200
commitfac693441f7c25c18e0948709ddb845afa7a2b40 (patch)
tree82b800d75008b53ecb0d9dda3ac9b269d7acc294 /target
parentd98409edbcc3ad35f7e4369b0fceac837e7abb0d (diff)
downloadupstream-fac693441f7c25c18e0948709ddb845afa7a2b40.tar.gz
upstream-fac693441f7c25c18e0948709ddb845afa7a2b40.tar.bz2
upstream-fac693441f7c25c18e0948709ddb845afa7a2b40.zip
bcm53xx: fix kernel config after USB2 PHY driver backport
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target')
-rw-r--r--target/linux/bcm53xx/config-4.49
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/bcm53xx/config-4.4 b/target/linux/bcm53xx/config-4.4
index f360211928..b1580319e3 100644
--- a/target/linux/bcm53xx/config-4.4
+++ b/target/linux/bcm53xx/config-4.4
@@ -54,10 +54,6 @@ CONFIG_ARM_THUMB=y
CONFIG_ARM_VIRT_EXT=y
CONFIG_ATAGS=y
CONFIG_AUTO_ZRELADDR=y
-CONFIG_SWCONFIG_B53=y
-# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
-# CONFIG_SWCONFIG_B53_PHY_DRIVER is not set
-CONFIG_SWCONFIG_B53_SRAB_DRIVER=y
CONFIG_BCM47XX_NVRAM=y
CONFIG_BCM47XX_SPROM=y
CONFIG_BCM47XX_WDT=y
@@ -257,6 +253,7 @@ CONFIG_PCI_DOMAINS_GENERIC=y
CONFIG_PERF_USE_VMALLOC=y
CONFIG_PGTABLE_LEVELS=2
CONFIG_PHYLIB=y
+# CONFIG_PHY_BCM_NS_USB2 is not set
CONFIG_PINCTRL=y
# CONFIG_PL310_ERRATA_588369 is not set
# CONFIG_PL310_ERRATA_727915 is not set
@@ -285,6 +282,10 @@ CONFIG_SPI_GPIO=y
CONFIG_SPI_MASTER=y
CONFIG_SRCU=y
CONFIG_SWCONFIG=y
+CONFIG_SWCONFIG_B53=y
+# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
+# CONFIG_SWCONFIG_B53_PHY_DRIVER is not set
+CONFIG_SWCONFIG_B53_SRAB_DRIVER=y
CONFIG_SWIOTLB=y
CONFIG_SWP_EMULATE=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y