kirkwood: disable the CONFIG_IP_ADVANCED_ROUTER kernel config override (#13702)

[openwrt.git] / target / linux / kirkwood / config-3.3

diff --git a/target/linux/kirkwood/config-3.3 b/target/linux/kirkwood/config-3.3
index d5234f4..d9899f3 100644 (file)
--- a/target/linux/kirkwood/config-3.3
+++ b/target/linux/kirkwood/config-3.3
@@ -11,10 +11,9 @@ CONFIG_ARM=y
 # CONFIG_ARM_CPU_SUSPEND is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_NR_BANKS=8
-# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_ARM_PATCH_PHYS_VIRT=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set
-CONFIG_BCMA_POSSIBLE=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
@@ -88,7 +87,6 @@ CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_HW_RANDOM=y
 CONFIG_INET_LRO=y
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_JBD2=y
@@ -99,7 +97,9 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MACH_D2NET_V2 is not set
 # CONFIG_MACH_DB88F6281_BP is not set
 CONFIG_MACH_DOCKSTAR=y
-# CONFIG_MACH_ESATA_SHEEVAPLUG is not set
+CONFIG_MACH_ESATA_SHEEVAPLUG=y 
+CONFIG_MACH_GOFLEXHOME=y
+CONFIG_MACH_GOFLEXNET=y
 # CONFIG_MACH_GURUPLUG is not set
 CONFIG_MACH_ICONNECT=y
 # CONFIG_MACH_INETSPACE_V2 is not set
@@ -150,11 +150,9 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PCI=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
-CONFIG_PHYS_OFFSET=0x0
 CONFIG_PLAT_ORION=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_MV=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SPLIT_PTLOCK_CPUS=999999
@@ -164,6 +162,7 @@ CONFIG_USB=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
@@ -171,7 +170,8 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VFP is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
-CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZONE_DMA_FLAG=0