From 96cefe6f06e546f850a028d48a798eaa20170b13 Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Mon, 25 Mar 2024 17:16:56 +0800 Subject: [PATCH] update fsbl source --- flake.nix | 6 ++---- fsbl.patch | 31 ------------------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 fsbl.patch diff --git a/flake.nix b/flake.nix index 16520b1..5aec2da 100644 --- a/flake.nix +++ b/flake.nix @@ -168,17 +168,15 @@ src = pkgs.fetchFromGitHub { owner = "Xilinx"; repo = "embeddedsw"; - rev = "65c849ed46c88c67457e1fc742744f96db968ff1"; - sha256 = "1rvl06ha40dzd6s9aa4sylmksh4xb9dqaxq462lffv1fdk342pda"; + rev = "xilinx_v2022.2"; + sha256 = "sha256-UDz9KK/Hw3qM1BAeKif30rE8Bi6C2uvuZlvyvtJCMfw="; }; - patches = [ ./fsbl.patch ]; nativeBuildInputs = [ pkgs.gnumake gnutoolchain.binutils gnutoolchain.gcc ]; patchPhase = '' - patch -p1 -i ${./fsbl.patch} patchShebangs lib/sw_apps/zynq_fsbl/misc/copy_bsp.sh echo 'SEARCH_DIR("${gnutoolchain.newlib}/arm-none-eabi/lib");' >> lib/sw_apps/zynq_fsbl/src/lscript.ld ''; diff --git a/fsbl.patch b/fsbl.patch deleted file mode 100644 index 2537177..0000000 --- a/fsbl.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/lib/sw_apps/zynq_fsbl/src/Makefile b/lib/sw_apps/zynq_fsbl/src/Makefile -index 0e3ccdf1c5..a5b02f386e 100644 ---- a/lib/sw_apps/zynq_fsbl/src/Makefile -+++ b/lib/sw_apps/zynq_fsbl/src/Makefile -@@ -71,11 +71,14 @@ endif - all: $(EXEC) - - $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) -- cp $(BSP_DIR)/$(BOARD)/ps7_init.* . - $(LINKER) $(LD1FLAGS) -o $@ $(OBJS) $(LDFLAGS) - rm -rf $(OBJS) -- -- -+ -+.PHONY: ps7_init -+ -+ps7_init: -+ cp $(BSP_DIR)/$(BOARD)/ps7_init.* . -+ - $(LIBS): - echo "Copying BSP files" - $(BSP_DIR)/copy_bsp.sh $(BOARD) $(CC) -@@ -86,7 +89,7 @@ $(LIBS): - make -C $(BSP_DIR) -k all "CC=armcc" "AR=armar" "C_FLAGS= -O2 -c" "EC_FLAGS=--debug --wchar32"; \ - fi; - --%.o:%.c -+%.o:%.c ps7_init - $(CC) $(CC_FLAGS) $(CFLAGS) $(ECFLAGS) -c $< -o $@ $(INCLUDEPATH) - - %.o:%.S