diff options
| author | Sammy <r62914@freescale.com> | 2009-08-21 12:41:41 +0800 |
|---|---|---|
| committer | Sammy <r62914@freescale.com> | 2009-08-21 12:43:08 +0800 |
| commit | 58ee23b00266c1dd0c8fb32a6e090a19469353b2 (patch) | |
| tree | bf29b3670dfdfac5aefffe849284a70a04087846 | |
| parent | a8c1bb4df7398a9966361bba1e9d057b17952bf7 (diff) | |
ENGR00115765-1 MX25: Change default command line in imx25_3stack_defconfig
Add rootfstype as jffs2 in CONFIG_CMDLINE.
Signed-off-by: Sammy He <r62914@freescale.com>
| -rw-r--r-- | arch/arm/configs/imx25_3stack_defconfig | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/configs/imx25_3stack_defconfig b/arch/arm/configs/imx25_3stack_defconfig index ea5b3fd85df..c7619814766 100644 --- a/arch/arm/configs/imx25_3stack_defconfig +++ b/arch/arm/configs/imx25_3stack_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28 -# Thu Jul 30 18:06:58 2009 +# Fri Aug 21 12:15:05 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -206,6 +206,7 @@ CONFIG_ARCH_MXC_HAS_NFC_V2_1=y CONFIG_DMA_ZONE_SIZE=24 CONFIG_UTMI_MXC=y CONFIG_UTMI_MXC_OTG=m +# CONFIG_MXC_PWM is not set # # Processor Type @@ -280,7 +281,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd console=ttymxc0 root=/dev/mtdblock2 rw ip=off" +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw rootfstype=jffs2 ip=off" # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -572,6 +573,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 @@ -784,10 +786,6 @@ CONFIG_HW_CONSOLE=y CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_MXC_IIM=y - -# -# IMX SIM support -# CONFIG_IMX_SIM=m # @@ -1153,9 +1151,7 @@ CONFIG_USB_OTG=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 @@ -1259,7 +1255,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 |