diff options
| -rw-r--r-- | arch/arm/boot/dts/emev2-kzm9d.dts | 2 | ||||
| -rw-r--r-- | arch/arm/configs/kzm9d_defconfig | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts index 297e3baba71c..b9b3241f173b 100644 --- a/arch/arm/boot/dts/emev2-kzm9d.dts +++ b/arch/arm/boot/dts/emev2-kzm9d.dts | |||
| @@ -21,6 +21,6 @@ | |||
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | chosen { | 23 | chosen { |
| 24 | bootargs = "console=ttyS1,115200n81"; | 24 | bootargs = "console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"; |
| 25 | }; | 25 | }; |
| 26 | }; | 26 | }; |
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig index 8c49df66cac3..6c37f4a98eb8 100644 --- a/arch/arm/configs/kzm9d_defconfig +++ b/arch/arm/configs/kzm9d_defconfig | |||
| @@ -32,11 +32,9 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 32 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 32 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 33 | CONFIG_ZBOOT_ROM_BSS=0x0 | 33 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 34 | CONFIG_ARM_APPENDED_DTB=y | 34 | CONFIG_ARM_APPENDED_DTB=y |
| 35 | CONFIG_CMDLINE="console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096" | ||
| 36 | CONFIG_CMDLINE_FORCE=y | ||
| 37 | CONFIG_VFP=y | 35 | CONFIG_VFP=y |
| 38 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 36 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 39 | # CONFIG_SUSPEND is not set | 37 | CONFIG_PM_RUNTIME=y |
| 40 | CONFIG_NET=y | 38 | CONFIG_NET=y |
| 41 | CONFIG_PACKET=y | 39 | CONFIG_PACKET=y |
| 42 | CONFIG_UNIX=y | 40 | CONFIG_UNIX=y |
