summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/imx35_3stack_defconfig13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/configs/imx35_3stack_defconfig b/arch/arm/configs/imx35_3stack_defconfig
index 75a09f78848e..08fcc91ad5cf 100644
--- a/arch/arm/configs/imx35_3stack_defconfig
+++ b/arch/arm/configs/imx35_3stack_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.28
-# Thu Jul 9 14:35:12 2009
+# Fri Aug 21 13:59:41 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -185,11 +185,11 @@ CONFIG_ARCH_MX35=y
CONFIG_I2C_MXC_SELECT1=y
# CONFIG_I2C_MXC_SELECT2 is not set
CONFIG_MXC_SDMA_API=y
+CONFIG_SDMA_IRAM=y
+CONFIG_SDMA_IRAM_SIZE=0x1000
CONFIG_ARCH_MXC_HAS_NFC_V2=y
CONFIG_ARCH_MXC_HAS_NFC_V2_1=y
# CONFIG_I2C_MXC_SELECT3 is not set
-CONFIG_SDMA_IRAM=y
-CONFIG_SDMA_IRAM_SIZE=0x1000
#
# MX35 Options
@@ -212,6 +212,7 @@ CONFIG_ARCH_HAS_RNGC=y
CONFIG_ARCH_HAS_EVTMON=y
CONFIG_DMA_ZONE_SIZE=24
CONFIG_UTMI_MXC=y
+# CONFIG_MXC_PWM is not set
#
# Processor Type
@@ -291,7 +292,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw rootfstype=jffs2 ip=off"
+CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock8 rw rootfstype=jffs2 ip=off"
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
@@ -520,6 +521,7 @@ CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_IMX_NFC is not set
CONFIG_MTD_NAND_MXC_V2=y
# CONFIG_MTD_NAND_MXC_SWECC is not set
# CONFIG_MTD_NAND_MXC_FORCE_CE is not set
@@ -1214,9 +1216,7 @@ CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ARC=y
CONFIG_USB_EHCI_ARC_H2=y
-# CONFIG_USB_EHCI_ARC_H2_WAKE_UP is not set
CONFIG_USB_EHCI_ARC_OTG=y
-# CONFIG_USB_EHCI_ARC_OTG_WAKE_UP is not set
# CONFIG_USB_STATIC_IRAM is not set
# CONFIG_USB_EHCI_FSL_MC13783 is not set
# CONFIG_USB_EHCI_FSL_1301 is not set
@@ -1319,7 +1319,6 @@ CONFIG_USB_ARC=m
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
CONFIG_USB_GADGET_ARC_OTG=y
-# CONFIG_USB_GADGET_WAKE_UP is not set
# CONFIG_USB_GADGET_FSL_MC13783 is not set
# CONFIG_USB_GADGET_FSL_1301 is not set
# CONFIG_USB_GADGET_FSL_1504 is not set