Use a smaller dtfs which fits in 16MiB flash map

Signed-off-by: Ryan O'Leary <[email protected]>

Author: rjoleary

src/mainboard/sifive/hifive/fixed-dtfs.dts

@@ -11,64 +11,36 @@
         board-url = "https://www.sifive.com/boards/hifive-unleashed";
         areas {
             area@0 {
-                description = "Boot Blob";
-                compatible = "ore-bootblob";
+                description = "Boot Blob and Ramstage";
                 offset = <0x0>;
                 size = <0x80000>; // 512KiB
                 file = "target/riscv64imac-unknown-none-elf/release/bootblob.bin";
             };
             area@1 {
                 description = "Fixed DTFS";
-                compatible = "ore-dtfs";
                 offset = <0x80000>;
                 size = <0x80000>; // 512KiB
                 file = "target/riscv64imac-unknown-none-elf/release/fixed-dtfs.dtb";
             };
             area@2 {
-                description = "NVRAM A";
-                compatible = "ore-nvram";
-                half = <0>;
+                description = "Payload A";
                 offset = <0x100000>;
-                size = <0x80000>; // 512KiB
+                size = <0x600000>; // 6MiB
+                file = "payloadA";
             };
             area@3 {
-                description = "NVRAM B";
-                compatible = "ore-nvram";
-                half = <1>;
-                offset = <0x180000>;
-                size = <0x80000>; // 512KiB
+                description = "Payload B";
+                offset = <0x700000>;
+                size = <0x600000>; // 6MiB
+                file = "payloadB";
             };
             area@4 {
-                description = "RomPayload DTFS A";
-                compatible = "ore-rompayload";
-                half = <0>;
-                offset = <0x200000>;
-                size = <0x100000>; // 1MiB
+                description = "Payload C";
+                offset = <0xd00000>;
+                size = <0x300000>; // 3MiB
+                file = "payloadC";
             };
             area@5 {
-                description = "RomPayload DTFS B";
-                compatible = "ore-rompayload";
-                half = <1>;
-                offset = <0x300000>;
-                size = <0x100000>; // 1MiB
-            };
-            area@6 {
-                description = "RamPayload DTFS A";
-                compatible = "ore-rampayload";
-                half = <0>;
-                offset = <0x400000>;
-                size = <0x600000>; // 6MiB
-                file = "../../../../payloads/src/external/simple/testtesttest";
-            };
-            area@7 {
-                description = "RamPayload DTFS B";
-                compatible = "ore-rampayload";
-                half = <1>;
-                offset = <0xa00000>;
-                size = <0x600000>; // 6MiB
-                file = "../../../../payloads/src/external/simple/testtesttest";
-            };
-            area@8 {
                 description = "Empty Space";
                 offset = <0x1000000>;
                 size = <0x1000000>; // 16MiB

src/mainboard/sifive/hifive/payloadA

@@ -0,0 +1 @@
+../../../../payloads/src/external/simple/testtesttest

src/mainboard/sifive/hifive/payloadB

@@ -0,0 +1 @@
+../../../../payloads/src/external/simple/testtesttest

src/mainboard/sifive/hifive/payloadC

@@ -0,0 +1 @@
+../../../../payloads/src/external/simple/testtesttest

src/mainboard/sifive/hifive/src/main.rs

@@ -121,7 +121,7 @@ pub extern "C" fn _start_boot_hart(_hart_id: usize, fdt_address: usize) -> ! {
         payload::Segment {
             typ: payload::stype::PAYLOAD_SEGMENT_ENTRY,
             base: mem,
-            data: &mut SectionReader::new(&Memory {}, 0x20000000 + 0x400000, 6 * 1024 * 1024),
+            data: &mut SectionReader::new(&Memory {}, 0x20000000 + 0x100000, 0x600000),
         },
         payload::Segment {
             typ: payload::stype::PAYLOAD_SEGMENT_DATA,