diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-09-23 15:55:19 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-09-23 15:55:19 +0800 |
| commit | 2ee51ffa3128d0a79dab13f423025e6cd9f37220 (patch) | |
| tree | 80fa7ff7a512d6cb351eb9fc81afaee86c2eb794 | |
| parent | 32f13804d89d110a3c6593aa716964dcf041da56 (diff) | |
| parent | 2726c3f27c569e4ebd5ae53c510be45d03636e7d (diff) | |
Merge commit 'tracking-hilt-dts-0918' into integration-hilt-lsk-androidintegration-hilt-lsk-android-0923
* commit 'tracking-hilt-dts-0918':
ARM: dts: change mem start add to 0x40000000
| -rw-r--r-- | arch/arm/boot/dts/hi4511.dts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi4511.dts index c16690fd50c7..2e85f395cd43 100644 --- a/arch/arm/boot/dts/hi4511.dts +++ b/arch/arm/boot/dts/hi4511.dts @@ -15,7 +15,7 @@ compatible = "hisilicon,hi3620-hi4511"; chosen { - bootargs = "console=ttyAMA0,115200 root=/dev/ram0 mem=512m earlyprintk no_console_suspend"; + bootargs = "console=ttyAMA0,115200 root=/dev/ram0 earlyprintk no_console_suspend"; }; cpus { @@ -52,7 +52,8 @@ }; memory { - reg = <0x00000000 0x20000000>; + device_type = "memory"; + reg = <0x40000000 0x20000000>; }; amba { |