diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 2e7ec3660..0d7d70275 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -31,7 +31,7 @@ config KERNEL_CRASHLOG
 
 config KERNEL_SWAP
 	bool "Support for paging of anonymous memory (swap)"
-	default y if !SMALL_FLASH
+	default y
 
 config KERNEL_DEBUG_FS
 	bool "Compile the kernel with debug filesystem enabled"
@@ -817,7 +817,7 @@ config KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE
 #
 choice
 	prompt "Compiler optimization level"
-	default KERNEL_CC_OPTIMIZE_FOR_SIZE if SMALL_FLASH
+	default KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE
 
 config KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE
 	bool "Optimize for performance"
diff --git a/target/linux/ar71xx/nand/target.mk b/target/linux/ar71xx/nand/target.mk
index 7532ec695..688eb97b2 100644
--- a/target/linux/ar71xx/nand/target.mk
+++ b/target/linux/ar71xx/nand/target.mk
@@ -1,5 +1,5 @@
 BOARDNAME := Generic devices with NAND flash
-FEATURES += squashfs nand rtc
+FEATURES += squashfs nand rtc small_flash
 
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x based boards with