Increase default amount of RAM for Base FVPs in FDTs

- Large RAM-disks may have trouble starting with 2GB of memory.
- Increase from 2GB to 4GB in FDT.

Change-Id: I12c1b8e5db41114b88c69c48621cb21247a6a6a7

diff --git a/docs/change-log.md b/docs/change-log.md
index 61499c78b074e3fc706af1eec0c8b03932b2a547..ee9be7758836b8c72daf3a2bf273b3a4f42ebc7a 100644 (file)
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -20,6 +20,10 @@ Detailed changes since last release
 *   Unmask SError and Debug exceptions in the trusted firmware.
     Also route external abort and SError interrupts to EL3.
 
+*   The amount of physical RAM available to Linux as specified in the FDTs for
+    Base FVPs have been increased from 2GB to 4GB. This resolves the issue of
+    failing to start user-space when using a RAM-disk file-system.
+
 
 ARM Trusted Firmware - version 0.2
 ==================================

diff --git a/docs/user-guide.md b/docs/user-guide.md
index 45e850b224e6a3ef6de864365ec1f81b884cdbcf..2c7439a7417603c2f4a102e7c0462c4dc9002e5d 100644 (file)
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -338,10 +338,6 @@ To prepare a VirtioBlock file-system, do the following:
 
 ##### Prepare RAM-disk
 
-NOTE: The RAM-disk option does not currently work with the Linux kernel version
-described above; use the VirtioBlock method instead. For further information
-please see the "Known issues" section in the [Change Log].
-
 To prepare a RAM-disk root file-system, do the following:
 
 1.  Download the file-system image:

diff --git a/fdts/fvp-base-gicv2-psci.dtb b/fdts/fvp-base-gicv2-psci.dtb
index bfb27106f6f791613c0c4b114408249c83e93165..5bfdcf1da5e6b0c0a7b5771a744a13eb08bc39ee 100644 (file)
Binary files a/fdts/fvp-base-gicv2-psci.dtb and b/fdts/fvp-base-gicv2-psci.dtb differ

diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts
index 7aa18a5ffaf861dfa1837915af4f936c1008a567..c8e8d13eeaf8d30bc25d2c2aca0ee8abe13dfe2f 100644 (file)
--- a/fdts/fvp-base-gicv2-psci.dts
+++ b/fdts/fvp-base-gicv2-psci.dts
@@ -115,10 +115,8 @@
 
        memory@80000000 {
                device_type = "memory";
-               reg = <0x00000000 0x80000000 0 0x80000000>;
-               /*
+               reg = <0x00000000 0x80000000 0 0x80000000>,
                      <0x00000008 0x80000000 0 0x80000000>;
-               */
        };
 
        gic: interrupt-controller@2f000000 {

diff --git a/fdts/fvp-base-gicv2legacy-psci.dtb b/fdts/fvp-base-gicv2legacy-psci.dtb
index 227c16173d8f72ffe9172b9ca0976258665062c6..db17e980623c34eea37249373decccb09daa2736 100644 (file)
Binary files a/fdts/fvp-base-gicv2legacy-psci.dtb and b/fdts/fvp-base-gicv2legacy-psci.dtb differ

diff --git a/fdts/fvp-base-gicv2legacy-psci.dts b/fdts/fvp-base-gicv2legacy-psci.dts
index 340ae500c247b38ea166d5ae0c016fd05cf7be0b..e53621e6c5067e797b75d74e03e755dd948a89bd 100644 (file)
--- a/fdts/fvp-base-gicv2legacy-psci.dts
+++ b/fdts/fvp-base-gicv2legacy-psci.dts
@@ -115,10 +115,8 @@
 
        memory@80000000 {
                device_type = "memory";
-               reg = <0x00000000 0x80000000 0 0x80000000>;
-               /*
+               reg = <0x00000000 0x80000000 0 0x80000000>,
                      <0x00000008 0x80000000 0 0x80000000>;
-               */
        };
 
        gic: interrupt-controller@2c001000 {

diff --git a/fdts/fvp-base-gicv3-psci.dtb b/fdts/fvp-base-gicv3-psci.dtb
index 5198cc7ea75ff7b6c0bf78a95f8311da3d247d22..52f251b88d76668d967dfb1a07dc006e076dd366 100644 (file)
Binary files a/fdts/fvp-base-gicv3-psci.dtb and b/fdts/fvp-base-gicv3-psci.dtb differ

diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts
index 8bafe2675ac561ac88b4dd53c7aae2127a781d0d..c51a6724ed9b6391542ad9e68e97f27dc266c93a 100644 (file)
--- a/fdts/fvp-base-gicv3-psci.dts
+++ b/fdts/fvp-base-gicv3-psci.dts
@@ -115,10 +115,8 @@
 
        memory@80000000 {
                device_type = "memory";
-               reg = <0x00000000 0x80000000 0 0x80000000>;
-               /*
+               reg = <0x00000000 0x80000000 0 0x80000000>,
                      <0x00000008 0x80000000 0 0x80000000>;
-               */
        };
 
        gic: interrupt-controller@2f000000 {