diff options
Diffstat (limited to 'arch/arm/configs/apalis_imx6_defconfig')
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index bfe253bdb772..146447446173 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -1,5 +1,4 @@ CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="-4.1.0+yocto" CONFIG_SYSVIPC=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y @@ -33,10 +32,9 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_MXC=y -CONFIG_GPIO_PCA953X=y CONFIG_ARCH_MX6=y CONFIG_FORCE_MAX_ZONEORDER=14 -CONFIG_MACH_MX6_NITROGEN6X=y +CONFIG_MACH_APALIS_IMX6=y CONFIG_IMX_PCIE=y CONFIG_PCIE_FORCE_GEN1=y CONFIG_USB_EHCI_ARC_H1=y @@ -64,7 +62,7 @@ CONFIG_COMPACTION=y CONFIG_KSM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd console=ttymxc1,115200 root=/dev/mmcblk0p1" +CONFIG_CMDLINE="ip=:::::eth0:on root=/dev/nfs rw netdevwait console=tty1 console=ttymxc0,115200n8 fbcon=map:1 fec_mac=00:14:2d:00:00:00" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |