summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-10 10:45:51 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-10 10:45:51 +0000
commit12827f99646a2060a3b6e6f8d5de993339cde0a4 (patch)
treeb98045f329893478ecf6360a40559619c1482494
parentce88f0a6d28a8274c96a2554ef3d1dbf85e8a781 (diff)
generic: move more common options to generic configuration
* CONFIG_ABX500_CORE * CONFIG_ATOMIC64_SELFTEST * CONFIG_BRIDGE_IGMP_SNOOPING * CONFIG_CAIF * CONFIG_CEPH_FS * CONFIG_CRYSTALHD * CONFIG_DEFAULT_SECURITY_SELINUX * CONFIG_DEFAULT_SECURITY_SMACK * CONFIG_DEFAULT_SECURITY_TOMOYO * CONFIG_DT3155 * CONFIG_IP_MROUTE_MULTIPLE_TABLES * CONFIG_L2TP * CONFIG_LOGFS * CONFIG_LPC_SCH * CONFIG_MFD_JANZ_CMODIO * CONFIG_MFD_RDC321X * CONFIG_N_GSM * CONFIG_RAMOOPS * CONFIG_SERIAL_ALTERA_JTAGUART * CONFIG_SERIAL_ALTERA_UART * CONFIG_SERIAL_TIMBERDALE * CONFIG_SM_FTL * CONFIG_SQUASHFS_XATTRS git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21750 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/config-2.6.333
-rw-r--r--target/linux/atheros/config-2.6.333
-rw-r--r--target/linux/atheros/config-2.6.3410
-rw-r--r--target/linux/atheros/config-2.6.3517
-rw-r--r--target/linux/brcm47xx/config-2.6.333
-rw-r--r--target/linux/brcm47xx/config-2.6.3410
-rw-r--r--target/linux/brcm47xx/config-2.6.3516
-rw-r--r--target/linux/brcm63xx/config-2.6.334
-rw-r--r--target/linux/generic-2.6/config-2.6.333
-rw-r--r--target/linux/ixp4xx/config-2.6.333
-rw-r--r--target/linux/mpc83xx/config-2.6.333
-rw-r--r--target/linux/mx2/config-2.6.345
-rw-r--r--target/linux/rb532/config-2.6.333
-rw-r--r--target/linux/rb532/config-2.6.345
14 files changed, 3 insertions, 85 deletions
diff --git a/target/linux/ar71xx/config-2.6.33 b/target/linux/ar71xx/config-2.6.33
index cd4deb8ab..3933145a8 100644
--- a/target/linux/ar71xx/config-2.6.33
+++ b/target/linux/ar71xx/config-2.6.33
@@ -100,9 +100,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
diff --git a/target/linux/atheros/config-2.6.33 b/target/linux/atheros/config-2.6.33
index fc0d9c85f..83c5e0d3b 100644
--- a/target/linux/atheros/config-2.6.33
+++ b/target/linux/atheros/config-2.6.33
@@ -63,9 +63,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
diff --git a/target/linux/atheros/config-2.6.34 b/target/linux/atheros/config-2.6.34
index a2d02b5c7..6faaf3236 100644
--- a/target/linux/atheros/config-2.6.34
+++ b/target/linux/atheros/config-2.6.34
@@ -21,12 +21,10 @@ CONFIG_ATHEROS_WDT=y
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
CONFIG_BITREVERSE=y
-# CONFIG_BRIDGE_IGMP_SNOOPING is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CEPH_FS is not set
CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
@@ -63,17 +61,12 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYSTALHD is not set
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NONCOHERENT=y
-# CONFIG_DT3155 is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_FSNOTIFY is not set
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -105,9 +98,7 @@ CONFIG_INITRAMFS_SOURCE=""
CONFIG_IP17XX_PHY=y
CONFIG_IRQ_CPU=y
# CONFIG_LEDS_GPIO is not set
-# CONFIG_LOGFS is not set
CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_LPC_SCH is not set
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -154,7 +145,6 @@ CONFIG_SCSI_MOD=y
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
diff --git a/target/linux/atheros/config-2.6.35 b/target/linux/atheros/config-2.6.35
index 1b4dd9274..dbace802c 100644
--- a/target/linux/atheros/config-2.6.35
+++ b/target/linux/atheros/config-2.6.35
@@ -1,6 +1,5 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-# CONFIG_ABX500_CORE is not set
CONFIG_ADM6996_PHY=y
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
CONFIG_AR231X_ETHERNET=y
@@ -19,13 +18,10 @@ CONFIG_ATHEROS_AR2315_PCI=y
CONFIG_ATHEROS_AR231X=y
CONFIG_ATHEROS_AR5312=y
CONFIG_ATHEROS_WDT=y
-# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
CONFIG_BITREVERSE=y
-# CONFIG_BRIDGE_IGMP_SNOOPING is not set
# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CAIF is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -65,7 +61,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CROSS_COMPILE=""
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
@@ -100,10 +95,7 @@ CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IP175C_PHY=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
CONFIG_IRQ_CPU=y
-# CONFIG_L2TP is not set
# CONFIG_LEDS_GPIO is not set
CONFIG_LOONGSON_UART_BASE=y
# CONFIG_MACH_ALCHEMY is not set
@@ -113,9 +105,6 @@ CONFIG_LOONGSON_UART_BASE=y
# CONFIG_MACH_TX39XX is not set
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_RDC321X is not set
-CONFIG_MFD_SUPPORT=y
# CONFIG_MIKROTIK_RB532 is not set
CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
@@ -140,7 +129,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
-# CONFIG_N_GSM is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
@@ -150,15 +138,12 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
# CONFIG_POWERTV is not set
-# CONFIG_RAMOOPS is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
CONFIG_SCSI_MOD=y
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -171,8 +156,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
# CONFIG_SIBYTE_RHONE is not set
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_SQUASHFS_XATTRS is not set
# CONFIG_SWAP is not set
CONFIG_SWCONFIG=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
diff --git a/target/linux/brcm47xx/config-2.6.33 b/target/linux/brcm47xx/config-2.6.33
index 58d3f216c..4d86c5176 100644
--- a/target/linux/brcm47xx/config-2.6.33
+++ b/target/linux/brcm47xx/config-2.6.33
@@ -63,9 +63,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
diff --git a/target/linux/brcm47xx/config-2.6.34 b/target/linux/brcm47xx/config-2.6.34
index d795e6dfe..d0e390679 100644
--- a/target/linux/brcm47xx/config-2.6.34
+++ b/target/linux/brcm47xx/config-2.6.34
@@ -19,13 +19,11 @@ CONFIG_BCM47XX=y
CONFIG_BCM47XX_WDT=y
# CONFIG_BCM63XX is not set
CONFIG_BITREVERSE=y
-# CONFIG_BRIDGE_IGMP_SNOOPING is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_BUG is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CEPH_FS is not set
CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
CONFIG_CFE=y
@@ -63,17 +61,12 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYSTALHD is not set
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NONCOHERENT=y
-# CONFIG_DT3155 is not set
# CONFIG_FSNOTIFY is not set
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -109,9 +102,7 @@ CONFIG_IRQ_CPU=y
CONFIG_KALLSYMS=y
# CONFIG_KSZ884X_PCI is not set
CONFIG_LEDS_GPIO=y
-# CONFIG_LOGFS is not set
CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_LPC_SCH is not set
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -153,7 +144,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
# CONFIG_SERIAL_8250_RSA is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
diff --git a/target/linux/brcm47xx/config-2.6.35 b/target/linux/brcm47xx/config-2.6.35
index 278b96bb3..ac644b62b 100644
--- a/target/linux/brcm47xx/config-2.6.35
+++ b/target/linux/brcm47xx/config-2.6.35
@@ -1,6 +1,5 @@
CONFIG_32BIT=y
# CONFIG_64BIT is not set
-# CONFIG_ABX500_CORE is not set
# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
# CONFIG_AR7 is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -12,7 +11,6 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SUPPORTS_OPROFILE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARPD is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_B44=y
CONFIG_B44_PCI=y
CONFIG_B44_PCICORE_AUTOSELECT=y
@@ -21,10 +19,8 @@ CONFIG_BCM47XX=y
CONFIG_BCM47XX_WDT=y
# CONFIG_BCM63XX is not set
CONFIG_BITREVERSE=y
-# CONFIG_BRIDGE_IGMP_SNOOPING is not set
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_BUG is not set
-# CONFIG_CAIF is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -65,7 +61,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
# CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_VR41XX is not set
-CONFIG_CROSS_COMPILE=""
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
@@ -101,11 +96,9 @@ CONFIG_HZ=250
CONFIG_HZ_250=y
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
# CONFIG_IP_ROUTE_VERBOSE is not set
CONFIG_IRQ_CPU=y
CONFIG_KALLSYMS=y
-# CONFIG_L2TP is not set
CONFIG_LEDS_GPIO=y
CONFIG_LOONGSON_UART_BASE=y
# CONFIG_MACH_ALCHEMY is not set
@@ -115,9 +108,6 @@ CONFIG_LOONGSON_UART_BASE=y
# CONFIG_MACH_TX39XX is not set
# CONFIG_MACH_TX49XX is not set
# CONFIG_MACH_VR41XX is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_RDC321X is not set
-CONFIG_MFD_SUPPORT=y
# CONFIG_MIKROTIK_RB532 is not set
CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
@@ -134,7 +124,6 @@ CONFIG_NO_HZ=y
# CONFIG_NO_IOPORT is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
-# CONFIG_N_GSM is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
@@ -145,7 +134,6 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_STB810 is not set
# CONFIG_POWERTV is not set
# CONFIG_PROC_KCORE is not set
-# CONFIG_RAMOOPS is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
CONFIG_SCSI_MOD=y
@@ -154,8 +142,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
# CONFIG_SERIAL_8250_RSA is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set
@@ -168,8 +154,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SIBYTE_RHONE is not set
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_SQUASHFS_XATTRS is not set
CONFIG_SSB=y
CONFIG_SSB_B43_PCI_BRIDGE=y
CONFIG_SSB_BLOCKIO=y
diff --git a/target/linux/brcm63xx/config-2.6.33 b/target/linux/brcm63xx/config-2.6.33
index 79864a146..f5951f506 100644
--- a/target/linux/brcm63xx/config-2.6.33
+++ b/target/linux/brcm63xx/config-2.6.33
@@ -77,10 +77,6 @@ CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEFAULT_SECURITY=""
-CONFIG_DEFAULT_SECURITY_DAC=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
index 664b508ff..da7328489 100644
--- a/target/linux/generic-2.6/config-2.6.33
+++ b/target/linux/generic-2.6/config-2.6.33
@@ -2897,4 +2897,7 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_ZONE_DMA=y
CONFIG_DEFAULT_SECURITY_DAC=y
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEFAULT_SECURITY=""
diff --git a/target/linux/ixp4xx/config-2.6.33 b/target/linux/ixp4xx/config-2.6.33
index 8ac52f3c5..705334ed8 100644
--- a/target/linux/ixp4xx/config-2.6.33
+++ b/target/linux/ixp4xx/config-2.6.33
@@ -37,9 +37,6 @@ CONFIG_CPU_XSCALE=y
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_USER is not set
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMABOUNCE=y
diff --git a/target/linux/mpc83xx/config-2.6.33 b/target/linux/mpc83xx/config-2.6.33
index ea9120c4c..bc48e1460 100644
--- a/target/linux/mpc83xx/config-2.6.33
+++ b/target/linux/mpc83xx/config-2.6.33
@@ -66,9 +66,6 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_DEFAULT_UIMAGE=y
# CONFIG_DEFAULT_WESTWOOD is not set
diff --git a/target/linux/mx2/config-2.6.34 b/target/linux/mx2/config-2.6.34
index 941be2410..254d16f0d 100644
--- a/target/linux/mx2/config-2.6.34
+++ b/target/linux/mx2/config-2.6.34
@@ -25,7 +25,6 @@ CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CEPH_FS is not set
CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
CONFIG_COMMON_CLKDEV=y
CONFIG_COMPAT_BRK=y
@@ -44,9 +43,6 @@ CONFIG_CPU_TLB_V4WBI=y
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_USER is not set
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_FPE_FASTFPE is not set
@@ -125,7 +121,6 @@ CONFIG_SCSI_MOD=y
# CONFIG_SERIAL_8250 is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIO=y
# CONFIG_SERIO_ALTERA_PS2 is not set
CONFIG_SERIO_LIBPS2=y
diff --git a/target/linux/rb532/config-2.6.33 b/target/linux/rb532/config-2.6.33
index 6f5ae0deb..9ca6f8832 100644
--- a/target/linux/rb532/config-2.6.33
+++ b/target/linux/rb532/config-2.6.33
@@ -58,9 +58,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
diff --git a/target/linux/rb532/config-2.6.34 b/target/linux/rb532/config-2.6.34
index a0bfb3943..df48c9475 100644
--- a/target/linux/rb532/config-2.6.34
+++ b/target/linux/rb532/config-2.6.34
@@ -21,7 +21,6 @@ CONFIG_BOOT_RAW=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CEPH_FS is not set
CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
CONFIG_CMDLINE_BOOL=y
@@ -60,9 +59,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_CSRC_R4K=y
CONFIG_CSRC_R4K_LIB=y
CONFIG_DECOMPRESS_LZMA=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NONCOHERENT=y
@@ -163,7 +159,6 @@ CONFIG_SCSI_MOD=y
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_PROC_FS is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set
# CONFIG_SGI_IP28 is not set