diff --git a/meta/recipes-bsp/opensbi/opensbi/0001-Makefile-Add-flag-for-reprodubility-compiler-flags.patch b/meta/recipes-bsp/opensbi/opensbi/0001-Makefile-Add-flag-for-reprodubility-compiler-flags.patch deleted file mode 100644 index e650476f50..0000000000 --- a/meta/recipes-bsp/opensbi/opensbi/0001-Makefile-Add-flag-for-reprodubility-compiler-flags.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f4c440219f42d74bd3d6688132ea876f3f51e601 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 14 May 2025 19:50:24 -0700 -Subject: [PATCH] Makefile: Add flag for reprodubility compiler flags - -Provides mechanism to remove absolute paths from binaries using --ffile-prefix-map - -It will help distros (e.g. yocto based ones ) which want to ship -the .elf files but need to scrub absolute paths in objects - -Upstream-Status: Submitted [https://lists.infradead.org/pipermail/opensbi/2025-May/008458.html] -Signed-off-by: Khem Raj ---- - Makefile | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Makefile b/Makefile -index e90836c7..22d4ecff 100644 ---- a/Makefile -+++ b/Makefile -@@ -174,6 +174,11 @@ else - USE_LD_FLAG = -fuse-ld=bfd - endif - -+REPRODUCIBLE ?= n -+ifeq ($(REPRODUCIBLE),y) -+REPRODUCIBLE_FLAGS += -ffile-prefix-map=$(src_dir)= -+endif -+ - # Check whether the linker supports creating PIEs - OPENSBI_LD_PIE := $(shell $(CC) $(CLANG_TARGET) $(RELAX_FLAG) $(USE_LD_FLAG) -fPIE -nostdlib -Wl,-pie -x c /dev/null -o /dev/null >/dev/null 2>&1 && echo y || echo n) - -@@ -362,6 +367,7 @@ GENFLAGS += $(firmware-genflags-y) - - CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-stack-protector -fno-strict-aliasing -ffunction-sections -fdata-sections - CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls -+CFLAGS += $(REPRODUCIBLE_FLAGS) - # Optionally supported flags - ifeq ($(CC_SUPPORT_VECTOR),y) - CFLAGS += -DOPENSBI_CC_SUPPORT_VECTOR -@@ -387,6 +393,7 @@ CPPFLAGS += $(firmware-cppflags-y) - ASFLAGS = -g -Wall -nostdlib - ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls - ASFLAGS += -fPIE -+ASFLAGS += $(REPRODUCIBLE_FLAGS) - # Optionally supported flags - ifeq ($(CC_SUPPORT_SAVE_RESTORE),y) - ASFLAGS += -mno-save-restore diff --git a/meta/recipes-bsp/opensbi/opensbi_1.6.bb b/meta/recipes-bsp/opensbi/opensbi_1.7.bb similarity index 93% rename from meta/recipes-bsp/opensbi/opensbi_1.6.bb rename to meta/recipes-bsp/opensbi/opensbi_1.7.bb index 308ac43ac8..a460062e93 100644 --- a/meta/recipes-bsp/opensbi/opensbi_1.6.bb +++ b/meta/recipes-bsp/opensbi/opensbi_1.7.bb @@ -8,10 +8,8 @@ require opensbi-payloads.inc inherit deploy -SRCREV = "bd613dd92113f683052acfb23d9dc8ba60029e0a" -SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \ - file://0001-Makefile-Add-flag-for-reprodubility-compiler-flags.patch \ -" +SRCREV = "a32a91069119e7a5aa31e6bc51d5e00860be3d80" +SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https" TARGET_DBGSRC_DIR = "/share/opensbi/*/generic/firmware/"