X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fetrax%2Fconfig-2.6.25;h=5a71d7dd96096c5c7e9d4cc85d55873c2562c0fd;hb=fe4503efb48683fa76727adc5ac6fb1900aa8fef;hp=caa6d38fc23de331791a1cb633fc9d8c43fb0eb4;hpb=02350b717e4fb9e55e333d24708ac432837fa875;p=openwrt-10.03%2F.git

diff --git a/target/linux/etrax/config-2.6.25 b/target/linux/etrax/config-2.6.25
index caa6d38fc..5a71d7dd9 100644
--- a/target/linux/etrax/config-2.6.25
+++ b/target/linux/etrax/config-2.6.25
@@ -14,7 +14,7 @@ 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=squashfs,jffs2 noinitrd console=ttyS0,115200"
 # CONFIG_ETRAX_CSP0_LEDS is not set
 # CONFIG_ETRAX_DEBUG_PORT0 is not set
 # CONFIG_ETRAX_DEBUG_PORT1 is not set
@@ -149,25 +149,15 @@ CONFIG_HAVE_IDE=y
 # CONFIG_HAVE_OPROFILE is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IDE is not set
 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 +172,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