[etrax] Cleanup kernel config

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15815 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 3 insertions, 26 deletions

diff --git a/target/linux/etrax/config-2.6.25 b/target/linux/etrax/config-2.6.25
index caa6d38fc2..d287655dd5 100644
--- a/target/linux/etrax/config-2.6.25
+++ b/target/linux/etrax/config-2.6.25
@@ -158,16 +158,10 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_MTDRAM_ABS_POS=0x0
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTDRAM_TOTAL_SIZE=0
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CONCAT=y
-CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_MTDRAM=y
 # CONFIG_NETDEV_1000 is not set
-CONFIG_NLS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
 CONFIG_NO_IOPORT=y
 # CONFIG_OOM_REBOOT is not set
 # CONFIG_RTC is not set
@@ -182,7 +176,5 @@ CONFIG_USB=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_WLAN_80211 is not set
diff --git a/target/linux/etrax/config-2.6.30 b/target/linux/etrax/config-2.6.30
index 6bff760ce8..054793f91a 100644
--- a/target/linux/etrax/config-2.6.30
+++ b/target/linux/etrax/config-2.6.30
@@ -6,10 +6,8 @@ CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BOUNCE=y
 # CONFIG_BRIDGE is not set
-# CONFIG_CFG80211 is not set
 CONFIG_CRIS=y
 # CONFIG_CRIS_MACH_ARTPEC3 is not set
-# CONFIG_CRYPTO is not set
 CONFIG_DEFAULT_VEGAS=y
 # CONFIG_DEFAULT_WESTWOOD is not set
 # CONFIG_ETRAX100LX is not set
@@ -18,13 +16,13 @@ CONFIG_ETRAX100LX_V2=y
 CONFIG_ETRAX_ARCH_V10=y
 # CONFIG_ETRAX_ARCH_V32 is not set
 CONFIG_ETRAX_AXISFLASHMAP=y
-CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
+CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock1 rootfstype=jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
 # CONFIG_ETRAX_CSP0_LEDS is not set
-CONFIG_ETRAX_DEBUG_PORT0=y
+# CONFIG_ETRAX_DEBUG_PORT0 is not set
 # CONFIG_ETRAX_DEBUG_PORT1 is not set
 # CONFIG_ETRAX_DEBUG_PORT2 is not set
 # CONFIG_ETRAX_DEBUG_PORT3 is not set
-# CONFIG_ETRAX_DEBUG_PORT_NULL is not set
+CONFIG_ETRAX_DEBUG_PORT_NULL=y
 CONFIG_ETRAX_DEF_R_BUS_CONFIG=0x4
 CONFIG_ETRAX_DEF_R_PORT_PA_DATA=0xf0
 CONFIG_ETRAX_DEF_R_PORT_PA_DIR=0x1c
@@ -156,15 +154,11 @@ CONFIG_HAVE_MLOCK=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C is not set
 # CONFIG_LIB80211 is not set
-# CONFIG_MAC80211 is not set
 CONFIG_MTDRAM_ABS_POS=0x0
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTDRAM_TOTAL_SIZE=0
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CONCAT=y
-CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_MTDRAM=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NF_DEFRAG_IPV4 is not set
@@ -173,11 +167,6 @@ CONFIG_NO_IOPORT=y
 # CONFIG_OOM_REBOOT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_RTC is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
@@ -186,10 +175,6 @@ CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_SYSTEM_PROFILER is not set
 CONFIG_UID16=y
 CONFIG_USB=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB_SUPPORT=y
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_WIRELESS_EXT_SYSFS is not set
 # CONFIG_WIRELESS_OLD_REGULATORY is not set