Merge pull request #7 from DLR-FT/dev/add-xilinx-uboot

feat: add U-Boot drv for zynq-zc702
DLR-FT · Apr 2, 2024 · 659b384 · 659b384
2 parents 97ac232 + 728a3f0
commit 659b384
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 44 deletions.
diff --git a/.ci/gen-workflow-files.nu b/.ci/gen-workflow-files.nu
@@ -111,7 +111,7 @@ for system in ($targets | columns) {
     )
 
     mut new_job = {
-      name: $"Build ($name)",
+      name: $"($name)",
       "runs-on": $runs_on,
       needs: $needs,
       steps: ($runner_setup | append [
@@ -126,7 +126,7 @@ for system in ($targets | columns) {
 
   # add check job
   $cachix_workflow.jobs = ($cachix_workflow.jobs | insert $"($system)---check" {
-    name: $"Run Nix checks on ($system)",
+    name: $"Check on ($system)",
     "runs-on": $runs_on,
     steps: ($runner_setup | append {
       name: Check,

diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
@@ -8,7 +8,7 @@ on:
       - main
 jobs:
   x86_64-linux---camkes-deps:
-    name: Build x86_64-linux.camkes-deps
+    name: x86_64-linux.camkes-deps
     runs-on:
       - ubuntu-latest
     needs:
@@ -28,7 +28,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.camkes-deps --print-build-logs
   x86_64-linux---capDL-tool:
-    name: Build x86_64-linux.capDL-tool
+    name: x86_64-linux.capDL-tool
     runs-on:
       - ubuntu-latest
     needs: []
@@ -44,7 +44,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.capDL-tool --print-build-logs
   x86_64-linux---concurrencytest:
-    name: Build x86_64-linux.concurrencytest
+    name: x86_64-linux.concurrencytest
     runs-on:
       - ubuntu-latest
     needs: []
@@ -60,7 +60,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.concurrencytest --print-build-logs
   x86_64-linux---guardonce:
-    name: Build x86_64-linux.guardonce
+    name: x86_64-linux.guardonce
     runs-on:
       - ubuntu-latest
     needs: []
@@ -76,7 +76,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.guardonce --print-build-logs
   x86_64-linux---pyfdt:
-    name: Build x86_64-linux.pyfdt
+    name: x86_64-linux.pyfdt
     runs-on:
       - ubuntu-latest
     needs: []
@@ -92,7 +92,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.pyfdt --print-build-logs
   x86_64-linux---seL4-deps:
-    name: Build x86_64-linux.seL4-deps
+    name: x86_64-linux.seL4-deps
     runs-on:
       - ubuntu-latest
     needs:
@@ -110,7 +110,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-deps --print-build-logs
   x86_64-linux---seL4-kernel-arm:
-    name: Build x86_64-linux.seL4-kernel-arm
+    name: x86_64-linux.seL4-kernel-arm
     runs-on:
       - ubuntu-latest
     needs:
@@ -129,7 +129,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-kernel-arm --print-build-logs
   x86_64-linux---seL4-kernel-arm-hyp:
-    name: Build x86_64-linux.seL4-kernel-arm-hyp
+    name: x86_64-linux.seL4-kernel-arm-hyp
     runs-on:
       - ubuntu-latest
     needs:
@@ -148,7 +148,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-kernel-arm-hyp --print-build-logs
   x86_64-linux---seL4-kernel-arm-mcs:
-    name: Build x86_64-linux.seL4-kernel-arm-mcs
+    name: x86_64-linux.seL4-kernel-arm-mcs
     runs-on:
       - ubuntu-latest
     needs:
@@ -167,7 +167,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-kernel-arm-mcs --print-build-logs
   x86_64-linux---seL4-kernel-riscv64:
-    name: Build x86_64-linux.seL4-kernel-riscv64
+    name: x86_64-linux.seL4-kernel-riscv64
     runs-on:
       - ubuntu-latest
     needs:
@@ -186,7 +186,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-kernel-riscv64 --print-build-logs
   x86_64-linux---seL4-kernel-riscv64-mcs:
-    name: Build x86_64-linux.seL4-kernel-riscv64-mcs
+    name: x86_64-linux.seL4-kernel-riscv64-mcs
     runs-on:
       - ubuntu-latest
     needs:
@@ -205,7 +205,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-kernel-riscv64-mcs --print-build-logs
   x86_64-linux---seL4-kernel-x64:
-    name: Build x86_64-linux.seL4-kernel-x64
+    name: x86_64-linux.seL4-kernel-x64
     runs-on:
       - ubuntu-latest
     needs:
@@ -224,7 +224,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-kernel-x64 --print-build-logs
   x86_64-linux---seL4-moritz-fork-arm:
-    name: Build x86_64-linux.seL4-moritz-fork-arm
+    name: x86_64-linux.seL4-moritz-fork-arm
     runs-on:
       - ubuntu-latest
     needs:
@@ -243,7 +243,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-moritz-fork-arm --print-build-logs
   x86_64-linux---seL4-moritz-fork-arm-hyp:
-    name: Build x86_64-linux.seL4-moritz-fork-arm-hyp
+    name: x86_64-linux.seL4-moritz-fork-arm-hyp
     runs-on:
       - ubuntu-latest
     needs:
@@ -262,7 +262,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-moritz-fork-arm-hyp --print-build-logs
   x86_64-linux---seL4-moritz-fork-arm-mcs:
-    name: Build x86_64-linux.seL4-moritz-fork-arm-mcs
+    name: x86_64-linux.seL4-moritz-fork-arm-mcs
     runs-on:
       - ubuntu-latest
     needs:
@@ -281,7 +281,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-moritz-fork-arm-mcs --print-build-logs
   x86_64-linux---seL4-moritz-fork-x64:
-    name: Build x86_64-linux.seL4-moritz-fork-x64
+    name: x86_64-linux.seL4-moritz-fork-x64
     runs-on:
       - ubuntu-latest
     needs:
@@ -300,7 +300,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-moritz-fork-x64 --print-build-logs
   x86_64-linux---seL4-test-aarch64-imx8mq-evk:
-    name: Build x86_64-linux.seL4-test-aarch64-imx8mq-evk
+    name: x86_64-linux.seL4-test-aarch64-imx8mq-evk
     runs-on:
       - ubuntu-latest
     needs:
@@ -319,7 +319,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-aarch64-imx8mq-evk --print-build-logs
   x86_64-linux---seL4-test-aarch64-rpi4-1GB:
-    name: Build x86_64-linux.seL4-test-aarch64-rpi4-1GB
+    name: x86_64-linux.seL4-test-aarch64-rpi4-1GB
     runs-on:
       - ubuntu-latest
     needs:
@@ -338,7 +338,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-aarch64-rpi4-1GB --print-build-logs
   x86_64-linux---seL4-test-aarch64-rpi4-2GB:
-    name: Build x86_64-linux.seL4-test-aarch64-rpi4-2GB
+    name: x86_64-linux.seL4-test-aarch64-rpi4-2GB
     runs-on:
       - ubuntu-latest
     needs:
@@ -357,7 +357,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-aarch64-rpi4-2GB --print-build-logs
   x86_64-linux---seL4-test-aarch64-rpi4-4GB:
-    name: Build x86_64-linux.seL4-test-aarch64-rpi4-4GB
+    name: x86_64-linux.seL4-test-aarch64-rpi4-4GB
     runs-on:
       - ubuntu-latest
     needs:
@@ -376,7 +376,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-aarch64-rpi4-4GB --print-build-logs
   x86_64-linux---seL4-test-aarch64-rpi4-8GB:
-    name: Build x86_64-linux.seL4-test-aarch64-rpi4-8GB
+    name: x86_64-linux.seL4-test-aarch64-rpi4-8GB
     runs-on:
       - ubuntu-latest
     needs:
@@ -395,7 +395,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-aarch64-rpi4-8GB --print-build-logs
   x86_64-linux---seL4-test-aarch64-zcu102:
-    name: Build x86_64-linux.seL4-test-aarch64-zcu102
+    name: x86_64-linux.seL4-test-aarch64-zcu102
     runs-on:
       - ubuntu-latest
     needs:
@@ -413,8 +413,8 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-aarch64-zcu102 --print-build-logs
-  x86_64-linux---seL4-test-armv7a-rpi3:
-    name: Build x86_64-linux.seL4-test-armv7a-rpi3
+  x86_64-linux---seL4-test-armv7l-rpi3:
+    name: x86_64-linux.seL4-test-armv7l-rpi3
     runs-on:
       - ubuntu-latest
     needs:
@@ -431,9 +431,9 @@ jobs:
           name: dlr-ft
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
-        run: nix build .#packages.x86_64-linux.seL4-test-armv7a-rpi3 --print-build-logs
-  x86_64-linux---seL4-test-armv7a-zynq7000:
-    name: Build x86_64-linux.seL4-test-armv7a-zynq7000
+        run: nix build .#packages.x86_64-linux.seL4-test-armv7l-rpi3 --print-build-logs
+  x86_64-linux---seL4-test-armv7l-zynq7000:
+    name: x86_64-linux.seL4-test-armv7l-zynq7000
     runs-on:
       - ubuntu-latest
     needs:
@@ -450,9 +450,9 @@ jobs:
           name: dlr-ft
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
-        run: nix build .#packages.x86_64-linux.seL4-test-armv7a-zynq7000 --print-build-logs
-  x86_64-linux---seL4-test-armv7a-zynq7000-simulate:
-    name: Build x86_64-linux.seL4-test-armv7a-zynq7000-simulate
+        run: nix build .#packages.x86_64-linux.seL4-test-armv7l-zynq7000 --print-build-logs
+  x86_64-linux---seL4-test-armv7l-zynq7000-simulate:
+    name: x86_64-linux.seL4-test-armv7l-zynq7000-simulate
     runs-on:
       - ubuntu-latest
     needs:
@@ -469,9 +469,9 @@ jobs:
           name: dlr-ft
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
-        run: nix build .#packages.x86_64-linux.seL4-test-armv7a-zynq7000-simulate --print-build-logs
+        run: nix build .#packages.x86_64-linux.seL4-test-armv7l-zynq7000-simulate --print-build-logs
   x86_64-linux---seL4-test-i686-ia32:
-    name: Build x86_64-linux.seL4-test-i686-ia32
+    name: x86_64-linux.seL4-test-i686-ia32
     runs-on:
       - ubuntu-latest
     needs:
@@ -490,7 +490,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-i686-ia32 --print-build-logs
   x86_64-linux---seL4-test-i686-ia32-simulate:
-    name: Build x86_64-linux.seL4-test-i686-ia32-simulate
+    name: x86_64-linux.seL4-test-i686-ia32-simulate
     runs-on:
       - ubuntu-latest
     needs:
@@ -509,7 +509,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-i686-ia32-simulate --print-build-logs
   x86_64-linux---seL4-test-x86_64-x86_64:
-    name: Build x86_64-linux.seL4-test-x86_64-x86_64
+    name: x86_64-linux.seL4-test-x86_64-x86_64
     runs-on:
       - ubuntu-latest
     needs:
@@ -528,7 +528,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-x86_64-x86_64 --print-build-logs
   x86_64-linux---seL4-test-x86_64-x86_64-simulate:
-    name: Build x86_64-linux.seL4-test-x86_64-x86_64-simulate
+    name: x86_64-linux.seL4-test-x86_64-x86_64-simulate
     runs-on:
       - ubuntu-latest
     needs:
@@ -546,8 +546,24 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
         run: nix build .#packages.x86_64-linux.seL4-test-x86_64-x86_64-simulate --print-build-logs
+  x86_64-linux---uboot-armv7l-zynq-zc702:
+    name: x86_64-linux.uboot-armv7l-zynq-zc702
+    runs-on:
+      - ubuntu-latest
+    needs: []
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v25
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v14
+        with:
+          name: dlr-ft
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+      - name: Build
+        run: nix build .#packages.x86_64-linux.uboot-armv7l-zynq-zc702 --print-build-logs
   x86_64-linux---check:
-    name: Run Nix checks on x86_64-linux
+    name: Check on x86_64-linux
     runs-on:
       - ubuntu-latest
     steps:

diff --git a/flake.nix b/flake.nix
@@ -199,25 +199,25 @@
             { extraCmakeFlags = [ "-DPLATFORM=zcu102" ]; };
 
 
-          seL4-test-armv7a-rpi3 = (import nixpkgs {
+          seL4-test-armv7l-rpi3 = (import nixpkgs {
             inherit system;
-            crossSystem.config = "armv7a-unknown-linux-musleabihf";
+            crossSystem.config = "armv7l-unknown-linux-musleabihf";
             overlays = [ self.overlays.default ];
           }).callPackage pkgs/seL4-test.nix
             { extraCmakeFlags = [ "-DPLATFORM=rpi3" ]; };
 
 
-          seL4-test-armv7a-zynq7000 = (import nixpkgs {
+          seL4-test-armv7l-zynq7000 = (import nixpkgs {
             inherit system;
-            crossSystem.config = "armv7a-unknown-linux-musleabihf";
+            crossSystem.config = "armv7l-unknown-linux-musleabihf";
             overlays = [ self.overlays.default ];
           }).callPackage pkgs/seL4-test.nix
             { extraCmakeFlags = [ "-DPLATFORM=zynq7000" ]; };
 
 
-          seL4-test-armv7a-zynq7000-simulate = (import nixpkgs {
+          seL4-test-armv7l-zynq7000-simulate = (import nixpkgs {
             inherit system;
-            crossSystem.config = "armv7a-unknown-linux-musleabihf";
+            crossSystem.config = "armv7l-unknown-linux-musleabihf";
             overlays = [ self.overlays.default ];
           }).callPackage pkgs/seL4-test.nix
             {
@@ -310,6 +310,31 @@
                 "-DSIMULATION=TRUE"
               ];
             };
+
+
+          #
+          ### UBoot with specific patches
+          #
+
+          # based of https://github.com/Xilinx/u-boot-xlnx/blob/master/doc/board/xilinx/zynq.rst
+          uboot-armv7l-zynq-zc702 = (import nixpkgs {
+            inherit system;
+            crossSystem.config = "armv7l-unknown-linux-musleabihf";
+            overlays = [ self.overlays.default ];
+          }).buildUBoot rec {
+            extraMeta.platforms = [ "armv7l-linux" ];
+            defconfig = "xilinx_zynq_virt_defconfig";
+            env.DEVICE_TREE = "zynq-zc702";
+            filesToInstall = [ "spl/boot.bin" "u-boot.img" ];
+            version = "xilinx-v2023.2";
+            src = pkgs.fetchFromGitHub {
+              owner = "Xilinx";
+              repo = "u-boot-xlnx";
+              rev = version;
+              hash = "sha256-tSOw7+Pe3/JYIgrPYB6exPzfGrRTuolxXXTux80w/X8=";
+            };
+          };
+
         };
 
         #