diff options
| -rw-r--r-- | arch/arm/boot/dts/sh7372-mackerel.dts | 4 | ||||
| -rw-r--r-- | arch/arm/configs/mackerel_defconfig | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sh7372-mackerel.dts b/arch/arm/boot/dts/sh7372-mackerel.dts index 286f0caef013..2623de8e3497 100644 --- a/arch/arm/boot/dts/sh7372-mackerel.dts +++ b/arch/arm/boot/dts/sh7372-mackerel.dts | |||
| @@ -15,6 +15,10 @@ | |||
| 15 | model = "Mackerel (AP4 EVM 2nd)"; | 15 | model = "Mackerel (AP4 EVM 2nd)"; |
| 16 | compatible = "renesas,mackerel"; | 16 | compatible = "renesas,mackerel"; |
| 17 | 17 | ||
| 18 | chosen { | ||
| 19 | bootargs = "console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp mem=240m rw"; | ||
| 20 | }; | ||
| 21 | |||
| 18 | memory { | 22 | memory { |
| 19 | device_type = "memory"; | 23 | device_type = "memory"; |
| 20 | reg = <0x40000000 0x10000000>; | 24 | reg = <0x40000000 0x10000000>; |
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 2098ce155542..e6881accf96a 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig | |||
| @@ -23,7 +23,7 @@ CONFIG_AEABI=y | |||
| 23 | CONFIG_FORCE_MAX_ZONEORDER=15 | 23 | CONFIG_FORCE_MAX_ZONEORDER=15 |
| 24 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 24 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 25 | CONFIG_ZBOOT_ROM_BSS=0x0 | 25 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 26 | CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m" | 26 | CONFIG_ARM_APPENDED_DTB=y |
| 27 | CONFIG_KEXEC=y | 27 | CONFIG_KEXEC=y |
| 28 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 28 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 29 | CONFIG_PM=y | 29 | CONFIG_PM=y |
