rk: memory: set vmalloc size to 496MB by default, so:

  1. if memory is 256MB, then: 256MB(lowmem)+744MB(vmalloc)+0MB(highmem)
  2. if memory is 512MB, then: 512MB(lowmem)+488MB(vmalloc)+0MB(highmem)
  3. if memory is large then 512MB, then: 512MB(lowmem)+488MB(vmalloc)+other(highmem)

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index 35c23765dd79c973585cfd140fee50774a30ca6b..e98de5af4cbfe52204ac40902a0ea835c8a18bad 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -9,7 +9,7 @@
        };
 
        chosen {
-               bootargs = "vmalloc=512M clk_ignore_unused";
+               bootargs = "vmalloc=496M clk_ignore_unused";
        };
 
        pwm_regulator1:pwm-regulator1 {

diff --git a/arch/arm/boot/dts/rk3288-p977.dts b/arch/arm/boot/dts/rk3288-p977.dts
index 6d74a360cd04a9fee5b090ce062c868385ed2d0e..9452c1aff290a9a7b1399f99550950cabc6b4e5e 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977.dts
+++ b/arch/arm/boot/dts/rk3288-p977.dts
@@ -152,10 +152,6 @@
                rockchip,remote_wakeup;
                rockchip,usb_irq_wakeup;
        };
-
-        chosen {
-                bootargs = "vmalloc=512M";
-        };
 };
 &pinctrl {
        gpio0_gpio {

diff --git a/arch/arm/boot/dts/rk3288-p977_8846.dts b/arch/arm/boot/dts/rk3288-p977_8846.dts
index 3e258850da6509cd273af3f79d1779d6977eb1d8..512e0946a6249d944afe9fc09b33243d351b9455 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977_8846.dts
+++ b/arch/arm/boot/dts/rk3288-p977_8846.dts
@@ -155,10 +155,6 @@
                rockchip,remote_wakeup;
                rockchip,usb_irq_wakeup;
        };
-
-        chosen {
-                bootargs = "vmalloc=512M";
-        };
 };
 &pinctrl {
        gpio0_gpio {

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 2f99f0b032dbf111351b77f00c918be8af0e7c21..097ba0ea1d0873ce87614f1558191e25295d7860 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -171,9 +171,6 @@
                rockchip,remote_wakeup;
                rockchip,usb_irq_wakeup;
        };
-       chosen {
-                bootargs = "vmalloc=512M";
-        };
 };
 
 &gmac {

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 392026378dcc06ff2a24845aeadf144403a587de..b837e4765f5a7775623fe725c476c93ea0fa23bc 100755 (executable)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1364,4 +1364,8 @@
                pinctrl-1 = <&sdcard_vcc_18>;
                pinctrl-2 = <&sdcard_vcc_33>;
        };
+
+        chosen {
+                bootargs = "vmalloc=496M";
+        };
 };