From afa00efee3debe973ca3d95a2f79f4a2b8bddb55 Mon Sep 17 00:00:00 2001
From: Florian Agbuya <fa@m-labs.ph>
Date: Fri, 16 Feb 2024 18:47:16 +0800
Subject: [PATCH] clean up device tree package

---
 fast-servo/{dts-support => }/fast-servo.dts |  0
 flake.nix                                   | 70 ++++++++++-----------
 2 files changed, 34 insertions(+), 36 deletions(-)
 rename fast-servo/{dts-support => }/fast-servo.dts (100%)

diff --git a/fast-servo/dts-support/fast-servo.dts b/fast-servo/fast-servo.dts
similarity index 100%
rename from fast-servo/dts-support/fast-servo.dts
rename to fast-servo/fast-servo.dts
diff --git a/flake.nix b/flake.nix
index 0ab1c60..16c2d66 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,6 @@
       pkgs = import nixpkgs { system = "x86_64-linux"; };
       not-os-cfg = not-os-configured.config.system;
       fsbl-support = ./fast-servo/fsbl-support;
-      dts-support = ./fast-servo/dts-support;
 
       patched-not-os = pkgs.applyPatches {
         name = "not-os-patched";
@@ -214,38 +213,40 @@
           dontFixup = true;
         };
 
-        u-boot = (pkgs.pkgsCross.armv7l-hf-multiplatform.buildUBoot {
-          defconfig = "xilinx_zynq_virt_defconfig";
-          patches = [] ++ pkgs.lib.optional (board == "fast-servo") ./fast-servo/u-boot.patch;
-          preConfigure = ''
-            export DEVICE_TREE=zynq-${board}
-          '';
-          extraConfig = ''
-            CONFIG_SYS_PROMPT="${board}-boot> "
-            CONFIG_AUTOBOOT=y
-            CONFIG_BOOTCOMMAND="${builtins.replaceStrings [ "\n" ] [ "; " ] ''
-              setenv bootargs 'root=/dev/mmcblk0p2 console=ttyPS0,115200n8 systemConfig=${builtins.unsafeDiscardStringContext not-os-cfg.build.toplevel}'
-              fatload mmc 0 0x6400000 uImage
-              fatload mmc 0 0x8000000 ${board}.dtb
-              fatload mmc 0 0xA400000 uRamdisk.image.gz
-              bootm 0x6400000 0xA400000 0x8000000
-            ''}"
-            CONFIG_BOOTDELAY=0
-            CONFIG_USE_BOOTCOMMAND=y
-          '';
-          extraMeta.platforms = [ "armv7l-linux" ];
-          filesToInstall = [ "u-boot.elf" ];
-        }).overrideAttrs (oldAttrs: {
-          postUnpack = ''
-            cp ${dts-support}/fast-servo.dts $sourceRoot/arch/arm/dts/zynq-fast-servo.dts
-          '';
-          postInstall = ''
-            mkdir -p $out/dts
-            cp arch/arm/dts/zynq-fast-servo.dts $out/dts
-            cp arch/arm/dts/zynq-zc706.dts $out/dts
-            cp arch/arm/dts/zynq-7000.dtsi $out/dts
-          '';
-        });
+        u-boot = let
+          fast-servo-dts = fast-servo/fast-servo.dts;
+          in (pkgs.pkgsCross.armv7l-hf-multiplatform.buildUBoot {
+            defconfig = "xilinx_zynq_virt_defconfig";
+            patches = [] ++ pkgs.lib.optional (board == "fast-servo") ./fast-servo/u-boot.patch;
+            preConfigure = ''
+              export DEVICE_TREE=zynq-${board}
+            '';
+            extraConfig = ''
+              CONFIG_SYS_PROMPT="${board}-boot> "
+              CONFIG_AUTOBOOT=y
+              CONFIG_BOOTCOMMAND="${builtins.replaceStrings [ "\n" ] [ "; " ] ''
+                setenv bootargs 'root=/dev/mmcblk0p2 console=ttyPS0,115200n8 systemConfig=${builtins.unsafeDiscardStringContext not-os-cfg.build.toplevel}'
+                fatload mmc 0 0x6400000 uImage
+                fatload mmc 0 0x8000000 ${board}.dtb
+                fatload mmc 0 0xA400000 uRamdisk.image.gz
+                bootm 0x6400000 0xA400000 0x8000000
+              ''}"
+              CONFIG_BOOTDELAY=0
+              CONFIG_USE_BOOTCOMMAND=y
+            '';
+            extraMeta.platforms = [ "armv7l-linux" ];
+            filesToInstall = [ "u-boot.elf" ];
+          }).overrideAttrs (oldAttrs: {
+            postUnpack = ''
+              cp ${fast-servo-dts} $sourceRoot/arch/arm/dts/zynq-fast-servo.dts
+            '';
+            postInstall = ''
+              mkdir -p $out/dts
+              cp arch/arm/dts/zynq-fast-servo.dts $out/dts
+              cp arch/arm/dts/zynq-zc706.dts $out/dts
+              cp arch/arm/dts/zynq-7000.dtsi $out/dts
+            '';
+          });
 
         bootimage = pkgs.runCommand "${board}-bootimage"
           {
@@ -274,8 +275,6 @@
           }
           ''
             mkdir -p $out
-            DTSDIR=$(mktemp -d /tmp/dts-XXXXXX)
-            cd $DTSDIR
             cp ${u-boot}/dts/zynq-${board}.dts .
 
             if [ ${board} == "zc706" ]; then
@@ -286,7 +285,6 @@
 
             dtc -I dts -O dtb -o ${board}.dtb zynq-${board}.dts
             cp ${board}.dtb $out
-            rm -rf $DTSDIR
           '';
 
         sd-image = let
-- 
2.44.1