From b9b5222cb6737d2062291c5b33fc26c41fb17c0a Mon Sep 17 00:00:00 2001
From: tim <tim@elec.ac.nz>
Date: Thu, 26 May 2022 20:31:15 +1200
Subject: [PATCH] Start using the device tree compiler. Addressing Issue #8

---
 .gitignore                     |  2 +-
 Dockerfile                     |  7 +++++++
 config/lichee_rv_dock_boot.its | 18 +-----------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index d8a4ed6..ba877e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-port**
+lichee_rv*/*
diff --git a/Dockerfile b/Dockerfile
index 4f15dc4..f1398b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -98,6 +98,13 @@ COPY config/bootscr.txt .
 RUN ./u-boot/tools/mkimage -T script -C none -O linux -A riscv -d bootscr.txt boot.scr
 # The boot script is here: boot.scr
 
+#
+# Try device tree FIT format
+#
+RUN apt-get install -y device-tree-compiler
+
+COPY config/${BOARD}_boot.its .
+RUN ./u-boot/tools/mkimage -f ${BOARD}_boot.its lichee_rv_boot.itb
 
 ############################################################################################
 #
diff --git a/config/lichee_rv_dock_boot.its b/config/lichee_rv_dock_boot.its
index a35cb62..55ae829 100644
--- a/config/lichee_rv_dock_boot.its
+++ b/config/lichee_rv_dock_boot.its
@@ -2,12 +2,11 @@
 
 / {
     description = "Lichee RV FIT Image";
-    #address-cells = <1>;
 
     images {
         uboot {
             description = "U-Boot";
-            data = /incbin/("u-boot-nodtb.bin");
+            data = /incbin/("u-boot/u-boot-nodtb.bin");
             type = "standalone";
             os = "U-Boot";
             arch = "riscv";
@@ -32,20 +31,6 @@
             compression = "none";
             load = <0x44000000>;
             entry = <0x44000000>;
-            hash {
-                algo = "sha1";
-            };
-        };
-        initrd {
-            description = "Initrd";
-            data = /incbin/("core-image-minimal-nitrogen8m.ext2.gz");
-            type = "ramdisk";
-            arch = "riscv64";
-            os = "linux";
-            compression = "none";
-            hash {
-                algo = "sha1";
-            };
         };
     };
 
@@ -53,7 +38,6 @@
         default = "standard";
         standard {
             description = "Standard Boot";
-            description = "U-Boot FIT";
             firmware = "opensbi";
             loadables = "uboot";
         };