[adm5120] do not overrid CONFIG_BRIDGE (#5163)

[openwrt.git] / target / linux / sibyte / config-default

diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default
index 5c52e5e..2066504 100644 (file)
--- a/target/linux/sibyte/config-default
+++ b/target/linux/sibyte/config-default
@@ -18,7 +18,6 @@ CONFIG_BOOT_ELF32=y
 CONFIG_BROADCOM_PHY=y
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT is not set
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CEVT_SB1250=y
@@ -27,9 +26,8 @@ CONFIG_CFE=y
 CONFIG_CLASSIC_RCU=y
 # CONFIG_CLS_U32_MARK is not set
 # CONFIG_CLS_U32_PERF is not set
-CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=duart0,115200 init=/etc/preinit"
+CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=duart0,115200"
 CONFIG_COMPAT=y
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_CONNECTOR=m
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_HAS_LLSC=y
@@ -92,10 +90,6 @@ CONFIG_HW_RANDOM=m
 CONFIG_HZ=250
 CONFIG_HZ_250=y
 # CONFIG_I2C is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IDE is not set
 # CONFIG_IEEE80211 is not set
 CONFIG_INITRAMFS_ROOT_GID=0
@@ -118,7 +112,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IRQ_CPU=y
 # CONFIG_ISDN is not set
 # CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_LEDS_ALIX is not set
 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_LIB80211 is not set
 # CONFIG_LLC2 is not set
@@ -130,7 +123,6 @@ CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MINI_FO=m
 CONFIG_MIPS32_COMPAT=y
@@ -157,10 +149,6 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
@@ -175,7 +163,6 @@ CONFIG_RESOURCES_64BIT=y
 # CONFIG_RFKILL is not set
 # CONFIG_RIO is not set
 # CONFIG_RISCOM8 is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SB1250_MAC=y
 # CONFIG_SB1_CERR_STALL is not set
 # CONFIG_SB1_CEX_ALWAYS_FATAL is not set
@@ -211,10 +198,7 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
 # CONFIG_SIBYTE_TBPROF is not set
 # CONFIG_SIMULATION is not set
 # CONFIG_SOUND is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPECIALIX is not set
-CONFIG_SSB_POSSIBLE=y
 # CONFIG_STALDRV is not set
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYS_HAS_CPU_SB1=y
@@ -225,7 +209,6 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set