From 90b241d24ec7e76042cb0a53881f2c7a4a020405 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 31 Dec 2024 16:48:10 +0100
Subject: [PATCH] Allow flashing

---
 devices/openwrt-one/default.nix | 12 +++++++++++-
 modules/outputs/uimage.nix      |  2 +-
 pkgs/kernel/kernel_fdt.its      |  4 ++--
 pkgs/kernel/uimage.nix          | 20 +++++++++++++++++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/devices/openwrt-one/default.nix b/devices/openwrt-one/default.nix
index 3cf2a8d3..2c42e56d 100644
--- a/devices/openwrt-one/default.nix
+++ b/devices/openwrt-one/default.nix
@@ -21,9 +21,18 @@
     Limitations
     ===========
 
+    - adding `he_bss_color="128"` causes `Invalid argument` for hostap
     - nvme support untested
     - I don't think the front LEDs work yet
-    - adding `he_bss_color="128"` causes `Invalid argument` for hostap
+
+    Installation
+    ============
+
+    - build the default output (the FIT image)
+    - rename it to 'openwrt-mediatek-filogic-openwrt_one-squashfs-sysupgrade.itb'
+    - start a TFTP server
+    - use 'Load production system via TFTP then write to NAND' and 'Boot production system from NAND'
+      from the serial uboot menu
   '';
 
   system = {
@@ -652,6 +661,7 @@
           #defaultOutput = "tftpboot";
           loadAddress = lim.parseInt "0x44000000";
           entryPoint = lim.parseInt "0x44000000";
+          alignment = 2048;
           rootDevice = "/dev/fit0";
           dts = {
             src = "${openwrt.src}/target/linux/mediatek/dts/mt7981b-openwrt-one.dts";
diff --git a/modules/outputs/uimage.nix b/modules/outputs/uimage.nix
index b36ef60a..ec25f1ec 100644
--- a/modules/outputs/uimage.nix
+++ b/modules/outputs/uimage.nix
@@ -25,6 +25,6 @@ in
     inherit (config.boot) commandLineDtbNode;
     inherit (config.hardware) loadAddress entryPoint alignment;
     inherit (config.boot) imageFormat;
-    inherit (o) kernel dtb;
+    inherit (o) kernel dtb rootfs;
   };
 }
diff --git a/pkgs/kernel/kernel_fdt.its b/pkgs/kernel/kernel_fdt.its
index c9907cf0..6127d80e 100644
--- a/pkgs/kernel/kernel_fdt.its
+++ b/pkgs/kernel/kernel_fdt.its
@@ -40,8 +40,8 @@
     };
 
     configurations {
-        default = "conf-1";
-        conf-1 {
+        default = "config-1";
+        config-1 {
             description = "Boot Linux kernel with FDT blob";
             kernel = "kernel";
             fdt = "fdt-1";
diff --git a/pkgs/kernel/uimage.nix b/pkgs/kernel/uimage.nix
index 96123a4a..8657a55b 100644
--- a/pkgs/kernel/uimage.nix
+++ b/pkgs/kernel/uimage.nix
@@ -22,6 +22,7 @@ in {
 , imageFormat
 , alignment ? null
 , dtb ? null
+, rootfs
 } : stdenv.mkDerivation {
   name = "kernel.image";
   phases = [
@@ -53,6 +54,7 @@ in {
 
   buildPhaseFIT = ''
     ${stripAndZip}
+    cp ${rootfs} rootfs
     cat ${./kernel_fdt.its} > mkimage.its
     cat << _VARS  >> mkimage.its
     / {
@@ -68,10 +70,26 @@ in {
                 data = /incbin/("./tmp.dtb");
                 arch = "${arch}";
             };
+            rootfs-1 {
+                description = "Liminix rootfs";
+                data = /incbin/("./rootfs");
+                type = "filesystem";
+                hash-1 {
+                        algo = "crc32";
+                };
+                hash-2 {
+                        algo = "sha1";
+                };
+            };
+        };
+        configurations {
+            config-1 {
+                loadables = "rootfs-1";
+            };
         };
     };
     _VARS
-    mkimage -f mkimage.its ${lib.optionalString (alignment != null) "-B 0x${lib.toHexString alignment}"} kernel.uimage
+    mkimage -f mkimage.its -E ${lib.optionalString (alignment != null) "-B 0x${lib.toHexString alignment}"} kernel.uimage
     mkimage -l kernel.uimage
   '';