aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-04-27 13:08:15 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-04-27 13:08:15 +0000
commit9fb0f9acd563b9cab1b02cd03b21846293fbaaa5 (patch)
treeaa6e014acc6165ea8f93777b19267f1a6b7d28d2
parent4095d243bd5cedee94a9ae4920ef8430a67901d0 (diff)
downloadupstream-9fb0f9acd563b9cab1b02cd03b21846293fbaaa5.tar.gz
upstream-9fb0f9acd563b9cab1b02cd03b21846293fbaaa5.tar.bz2
upstream-9fb0f9acd563b9cab1b02cd03b21846293fbaaa5.zip
rb532: refresh config options
SVN-Revision: 21188
-rw-r--r--target/linux/rb532/config-2.6.328
-rw-r--r--target/linux/rb532/config-2.6.339
-rw-r--r--target/linux/rb532/config-2.6.3416
3 files changed, 8 insertions, 25 deletions
diff --git a/target/linux/rb532/config-2.6.32 b/target/linux/rb532/config-2.6.32
index 30bc3a1a4b..132c1ba78f 100644
--- a/target/linux/rb532/config-2.6.32
+++ b/target/linux/rb532/config-2.6.32
@@ -16,7 +16,6 @@ CONFIG_ATA=y
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_SD=y
CONFIG_BOOT_RAW=y
-CONFIG_BRIDGE=m
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
@@ -89,8 +88,6 @@ CONFIG_HW_RANDOM=y
CONFIG_HZ=250
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_IRQ_CPU=y
@@ -98,7 +95,6 @@ CONFIG_KEXEC=y
CONFIG_KORINA=y
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_MIKROTIK_RB532=y
-CONFIG_LLC=m
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -143,7 +139,6 @@ CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PMC_YOSEMITE is not set
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RC32434_WDT=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_SCSI=y
@@ -163,9 +158,6 @@ CONFIG_SCSI=y
# CONFIG_SIBYTE_RHONE is not set
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_STP=m
# CONFIG_SWAP is not set
CONFIG_SWAP_IO_SPACE=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
diff --git a/target/linux/rb532/config-2.6.33 b/target/linux/rb532/config-2.6.33
index 79e2e1346b..26544948ff 100644
--- a/target/linux/rb532/config-2.6.33
+++ b/target/linux/rb532/config-2.6.33
@@ -16,7 +16,6 @@ CONFIG_ATA=y
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_SD=y
CONFIG_BOOT_RAW=y
-CONFIG_BRIDGE=m
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
@@ -99,8 +98,6 @@ CONFIG_HW_RANDOM=y
CONFIG_HZ=250
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_INLINE_READ_LOCK is not set
@@ -136,8 +133,9 @@ CONFIG_KEXEC=y
CONFIG_KORINA=y
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_MIKROTIK_RB532=y
-CONFIG_LLC=m
CONFIG_LOONGSON_UART_BASE=y
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -203,9 +201,6 @@ CONFIG_SCSI=y
# CONFIG_SIBYTE_RHONE is not set
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_STP=m
# CONFIG_SWAP is not set
CONFIG_SWAP_IO_SPACE=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
diff --git a/target/linux/rb532/config-2.6.34 b/target/linux/rb532/config-2.6.34
index eb8b58b8f9..e52db5baf1 100644
--- a/target/linux/rb532/config-2.6.34
+++ b/target/linux/rb532/config-2.6.34
@@ -17,12 +17,12 @@ CONFIG_ATA=y
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_SD=y
CONFIG_BOOT_RAW=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=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_BOOL=y
@@ -68,7 +68,6 @@ CONFIG_DECOMPRESS_LZMA=y
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
# CONFIG_DT3155 is not set
# CONFIG_ENABLE_WARN_DEPRECATED is not set
@@ -105,8 +104,6 @@ CONFIG_HW_RANDOM=y
CONFIG_HZ=250
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
CONFIG_IMAGE_CMDLINE_HACK=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_INLINE_READ_LOCK is not set
@@ -143,10 +140,11 @@ CONFIG_KORINA=y
# CONFIG_KSZ884X_PCI is not set
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_MIKROTIK_RB532=y
-CONFIG_LLC=m
# CONFIG_LOGFS is not set
CONFIG_LOONGSON_UART_BASE=y
# CONFIG_LPC_SCH is not set
+CONFIG_LZMA_COMPRESS=y
+CONFIG_LZMA_DECOMPRESS=y
# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
@@ -154,7 +152,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_MAX63XX_WATCHDOG is not set
# CONFIG_MFD_TIMBERDALE is not set
CONFIG_MIKROTIK_RB532=y
CONFIG_MIPS=y
@@ -179,6 +176,7 @@ CONFIG_MTD_PHYSMAP=y
# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
# CONFIG_MTD_ROOTFS_SPLIT is not set
# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CT_ACCT=y
# CONFIG_NO_IOPORT is not set
@@ -198,6 +196,7 @@ CONFIG_RC32434_WDT=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
+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
@@ -214,9 +213,6 @@ CONFIG_SCSI=y
# CONFIG_SIBYTE_RHONE is not set
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_STP=m
# CONFIG_SWAP is not set
CONFIG_SWAP_IO_SPACE=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y