From 3dad4fb3d18ff0906c4eacc18a1449284a09fa99 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Fri, 6 Sep 2024 08:22:14 +0200 Subject: [PATCH] Move patches to its own directory --- lagarto-hun.nix | 2 +- lagarto-ox.nix | 28 +++++++++---------- overlay.nix | 8 +++--- .../alveo-uart-sbi-hack.patch | 0 .../busybox-debug.patch | 0 .../ethernet-driver-build.patch | 0 .../ethernet-driver-kbuild.patch | 0 .../ethernet-driver-poll.patch | 0 .../opensbi-dont-delegate.patch | 0 .../opensbi-dump-mregs.patch | 0 .../opensbi-enable-meip.patch | 0 .../opensbi-enable-seip.patch | 0 .../opensbi-lagarto-hun.patch | 0 .../opensbi-test-plic.patch | 0 .../opensbi-timer-debug.patch | 0 .../ox-alveo-platform-plic.patch | 0 .../ox-alveo-platform.patch | 0 .../sa-fpga-crt.patch | 0 .../sa-fpga-plic-registers.patch | 0 .../sa-fpga-text-address.patch | 0 .../sa-fpga-uart.patch | 0 .../u-boot-debug.patch | 0 .../uboot-debug-ext-interrupts.patch | 0 .../uboot-exception-extras.patch | 0 24 files changed, 19 insertions(+), 19 deletions(-) rename alveo-uart-sbi-hack.patch => patches/alveo-uart-sbi-hack.patch (100%) rename busybox-debug.patch => patches/busybox-debug.patch (100%) rename ethernet-driver-build.patch => patches/ethernet-driver-build.patch (100%) rename ethernet-driver-kbuild.patch => patches/ethernet-driver-kbuild.patch (100%) rename ethernet-driver-poll.patch => patches/ethernet-driver-poll.patch (100%) rename opensbi-dont-delegate.patch => patches/opensbi-dont-delegate.patch (100%) rename opensbi-dump-mregs.patch => patches/opensbi-dump-mregs.patch (100%) rename opensbi-enable-meip.patch => patches/opensbi-enable-meip.patch (100%) rename opensbi-enable-seip.patch => patches/opensbi-enable-seip.patch (100%) rename opensbi-lagarto-hun.patch => patches/opensbi-lagarto-hun.patch (100%) rename opensbi-test-plic.patch => patches/opensbi-test-plic.patch (100%) rename opensbi-timer-debug.patch => patches/opensbi-timer-debug.patch (100%) rename ox-alveo-platform-plic.patch => patches/ox-alveo-platform-plic.patch (100%) rename ox-alveo-platform.patch => patches/ox-alveo-platform.patch (100%) rename sa-fpga-crt.patch => patches/sa-fpga-crt.patch (100%) rename sa-fpga-plic-registers.patch => patches/sa-fpga-plic-registers.patch (100%) rename sa-fpga-text-address.patch => patches/sa-fpga-text-address.patch (100%) rename sa-fpga-uart.patch => patches/sa-fpga-uart.patch (100%) rename u-boot-debug.patch => patches/u-boot-debug.patch (100%) rename uboot-debug-ext-interrupts.patch => patches/uboot-debug-ext-interrupts.patch (100%) rename uboot-exception-extras.patch => patches/uboot-exception-extras.patch (100%) diff --git a/lagarto-hun.nix b/lagarto-hun.nix index 51359ba..a1a98a8 100644 --- a/lagarto-hun.nix +++ b/lagarto-hun.nix @@ -126,7 +126,7 @@ "PLATFORM=fpga/openpiton" "FW_PAYLOAD_PATH=${final.uboot}/u-boot-nodtb.bin" ]; - patches = [ ./opensbi-lagarto-hun.patch ]; + patches = [ ./patches/opensbi-lagarto-hun.patch ]; }); }) ]; } diff --git a/lagarto-ox.nix b/lagarto-ox.nix index 3e5e404..6f71896 100644 --- a/lagarto-ox.nix +++ b/lagarto-ox.nix @@ -357,7 +357,7 @@ nixpkgs.overlays = [ (final: prev: { #busybox = prev.busybox.overrideAttrs (old: { # # Print some debug lines on switch_root to see where it hangs. - # patches = (old.patches or []) ++ [ ./busybox-debug.patch ]; + # patches = (old.patches or []) ++ [ ./patches/busybox-debug.patch ]; #}); linuxPackages_latest = prev.linuxPackages_latest; @@ -396,9 +396,9 @@ # rev = "f80a22a480f0e4157647bacf90e663be457c72c4"; #}; patches = [ - #./u-boot-debug.patch - ./uboot-debug-ext-interrupts.patch - ./uboot-exception-extras.patch + #./patches/u-boot-debug.patch + ./patches/uboot-debug-ext-interrupts.patch + ./patches/uboot-exception-extras.patch ]; # Copy our environment to board/emulation/qemu-riscv/environ.env preConfigure = '' @@ -523,13 +523,13 @@ "FW_PAYLOAD_FDT_ADDR=0xc0000000" ]; patches = [ - #./opensbi-timer-debug.patch # Print calls to machine trap - #./opensbi-enable-meip.patch - #./opensbi-enable-seip.patch - #./opensbi-test-plic.patch # Working delegation test, disabled for now - ./opensbi-dump-mregs.patch - #./opensbi-dont-delegate.patch - #./ox-alveo-platform-plic.patch + #./patches/opensbi-timer-debug.patch # Print calls to machine trap + #./patches/opensbi-enable-meip.patch + #./patches/opensbi-enable-seip.patch + #./patches/opensbi-test-plic.patch # Working delegation test, disabled for now + ./patches/opensbi-dump-mregs.patch + #./patches/opensbi-dont-delegate.patch + #./patches/ox-alveo-platform-plic.patch ]; }); @@ -545,9 +545,9 @@ ref = "master"; }; patches = [ - ./ethernet-driver-poll.patch - ./ethernet-driver-build.patch - ./ethernet-driver-kbuild.patch + ./patches/ethernet-driver-poll.patch + ./patches/ethernet-driver-build.patch + ./patches/ethernet-driver-kbuild.patch ]; preConfigure = '' export sourceRoot=$PWD/drivers diff --git a/overlay.nix b/overlay.nix index 9cf6788..c88a431 100644 --- a/overlay.nix +++ b/overlay.nix @@ -42,10 +42,10 @@ final: prev: }; dontConfigure = true; patches = [ - #./sa-fpga-crt.patch - #./sa-fpga-text-address.patch - ./sa-fpga-uart.patch - ./sa-fpga-plic-registers.patch + #./patches/sa-fpga-crt.patch + #./patches/sa-fpga-text-address.patch + ./patches/sa-fpga-uart.patch + ./patches/sa-fpga-plic-registers.patch ]; buildPhase = '' cd fpga_core_bridge/simulator/tests/c_tests/ diff --git a/alveo-uart-sbi-hack.patch b/patches/alveo-uart-sbi-hack.patch similarity index 100% rename from alveo-uart-sbi-hack.patch rename to patches/alveo-uart-sbi-hack.patch diff --git a/busybox-debug.patch b/patches/busybox-debug.patch similarity index 100% rename from busybox-debug.patch rename to patches/busybox-debug.patch diff --git a/ethernet-driver-build.patch b/patches/ethernet-driver-build.patch similarity index 100% rename from ethernet-driver-build.patch rename to patches/ethernet-driver-build.patch diff --git a/ethernet-driver-kbuild.patch b/patches/ethernet-driver-kbuild.patch similarity index 100% rename from ethernet-driver-kbuild.patch rename to patches/ethernet-driver-kbuild.patch diff --git a/ethernet-driver-poll.patch b/patches/ethernet-driver-poll.patch similarity index 100% rename from ethernet-driver-poll.patch rename to patches/ethernet-driver-poll.patch diff --git a/opensbi-dont-delegate.patch b/patches/opensbi-dont-delegate.patch similarity index 100% rename from opensbi-dont-delegate.patch rename to patches/opensbi-dont-delegate.patch diff --git a/opensbi-dump-mregs.patch b/patches/opensbi-dump-mregs.patch similarity index 100% rename from opensbi-dump-mregs.patch rename to patches/opensbi-dump-mregs.patch diff --git a/opensbi-enable-meip.patch b/patches/opensbi-enable-meip.patch similarity index 100% rename from opensbi-enable-meip.patch rename to patches/opensbi-enable-meip.patch diff --git a/opensbi-enable-seip.patch b/patches/opensbi-enable-seip.patch similarity index 100% rename from opensbi-enable-seip.patch rename to patches/opensbi-enable-seip.patch diff --git a/opensbi-lagarto-hun.patch b/patches/opensbi-lagarto-hun.patch similarity index 100% rename from opensbi-lagarto-hun.patch rename to patches/opensbi-lagarto-hun.patch diff --git a/opensbi-test-plic.patch b/patches/opensbi-test-plic.patch similarity index 100% rename from opensbi-test-plic.patch rename to patches/opensbi-test-plic.patch diff --git a/opensbi-timer-debug.patch b/patches/opensbi-timer-debug.patch similarity index 100% rename from opensbi-timer-debug.patch rename to patches/opensbi-timer-debug.patch diff --git a/ox-alveo-platform-plic.patch b/patches/ox-alveo-platform-plic.patch similarity index 100% rename from ox-alveo-platform-plic.patch rename to patches/ox-alveo-platform-plic.patch diff --git a/ox-alveo-platform.patch b/patches/ox-alveo-platform.patch similarity index 100% rename from ox-alveo-platform.patch rename to patches/ox-alveo-platform.patch diff --git a/sa-fpga-crt.patch b/patches/sa-fpga-crt.patch similarity index 100% rename from sa-fpga-crt.patch rename to patches/sa-fpga-crt.patch diff --git a/sa-fpga-plic-registers.patch b/patches/sa-fpga-plic-registers.patch similarity index 100% rename from sa-fpga-plic-registers.patch rename to patches/sa-fpga-plic-registers.patch diff --git a/sa-fpga-text-address.patch b/patches/sa-fpga-text-address.patch similarity index 100% rename from sa-fpga-text-address.patch rename to patches/sa-fpga-text-address.patch diff --git a/sa-fpga-uart.patch b/patches/sa-fpga-uart.patch similarity index 100% rename from sa-fpga-uart.patch rename to patches/sa-fpga-uart.patch diff --git a/u-boot-debug.patch b/patches/u-boot-debug.patch similarity index 100% rename from u-boot-debug.patch rename to patches/u-boot-debug.patch diff --git a/uboot-debug-ext-interrupts.patch b/patches/uboot-debug-ext-interrupts.patch similarity index 100% rename from uboot-debug-ext-interrupts.patch rename to patches/uboot-debug-ext-interrupts.patch diff --git a/uboot-exception-extras.patch b/patches/uboot-exception-extras.patch similarity index 100% rename from uboot-exception-extras.patch rename to patches/uboot-exception-extras.patch