From 92991371f6b1673dcc65ed4dd7651a56a2800409 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Fri, 29 Mar 2013 15:39:13 +0100 Subject: [PATCH] Revert "DIR300: little work on memory consumption" that work wasn't finished This reverts commit 57d8060ab79aa887c59e479626affbb8eeac7aeb. --- bsp/dir300/kernel_config-3.3 | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bsp/dir300/kernel_config-3.3 b/bsp/dir300/kernel_config-3.3 index 234b812..1c4eab5 100644 --- a/bsp/dir300/kernel_config-3.3 +++ b/bsp/dir300/kernel_config-3.3 @@ -13,15 +13,15 @@ CONFIG_ATHEROS_WDT=y # CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=1 CONFIG_BCMA_POSSIBLE=y -# CONFIG_BLK_DEV_INITRD is not set # CONFIG_BUG is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y -CONFIG_CLEANCACHE=y CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2" CONFIG_CMDLINE_BOOL=y # CONFIG_CMDLINE_OVERRIDE is not set +CONFIG_COMPACTION=y +CONFIG_COMPAT_BRK=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y @@ -32,9 +32,11 @@ CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CSRC_R4K=y CONFIG_CSRC_R4K_LIB=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_DMA_NONCOHERENT=y CONFIG_EARLY_PRINTK=y -CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_ETHERNET_PACKET_MANGLE=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -70,6 +72,7 @@ CONFIG_HAVE_PERF_EVENTS=y # CONFIG_HIGH_RES_TIMERS is not set CONFIG_HW_RANDOM=y CONFIG_IMAGE_CMDLINE_HACK=y +CONFIG_INITRAMFS_SOURCE="" CONFIG_IP17XX_PHY=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_MULTICAST is not set @@ -82,10 +85,11 @@ CONFIG_JFFS2_CMODE_FAVOURLZO=y CONFIG_JFFS2_LZO=y # CONFIG_LBDAF is not set CONFIG_LEDS_GPIO=y -CONFIG_LOG_BUF_SHIFT=14 +CONFIG_LOG_BUF_SHIFT=12 CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MDIO_BOARDINFO=y +CONFIG_MIGRATION=y CONFIG_MIPS=y CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MACHINE is not set @@ -98,6 +102,7 @@ CONFIG_MTD_MYLOADER_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3 CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MVSWITCH_PHY=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y # CONFIG_NETWORK_FILESYSTEMS is not set @@ -124,7 +129,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1 # CONFIG_SLAB is not set CONFIG_SLOB=y CONFIG_SQUASHFS_EMBEDDED=y -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=0 +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=1 +# CONFIG_STAGING is not set # CONFIG_SWAP is not set CONFIG_SWCONFIG=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y @@ -132,9 +138,5 @@ CONFIG_SYS_HAS_EARLY_PRINTK=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y -CONFIG_XVMALLOC=y CONFIG_XZ_DEC=y -# CONFIG_ZCACHE is not set CONFIG_ZONE_DMA_FLAG=0 -CONFIG_ZRAM=y -# CONFIG_ZRAM_DEBUG is not set