diff options
Diffstat (limited to 'meta/recipes-bsp/gnu-efi/gnu-efi')
5 files changed, 94 insertions, 46 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch new file mode 100644 index 0000000000..3475606264 --- /dev/null +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 1de509497826faa0ad84b82f5e2c3d21ee613459 Mon Sep 17 00:00:00 2001 | ||
2 | From: Moody Liu <mooodyhunter@outlook.com> | ||
3 | Date: Sat, 13 May 2023 17:39:16 +0100 | ||
4 | Subject: [PATCH] riscv64: adjust type definitions | ||
5 | |||
6 | CHAR8 needs to be defined while BOOLEAN should be removed | ||
7 | here to prevent typedef conflicts | ||
8 | |||
9 | Upstream-Status: Backport [https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/] | ||
10 | Signed-off-by: Moody Liu <mooodyhunter@outlook.com> | ||
11 | --- | ||
12 | inc/riscv64/efibind.h | 4 +--- | ||
13 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/inc/riscv64/efibind.h b/inc/riscv64/efibind.h | ||
16 | index 4fdf81d..d8b4f39 100644 | ||
17 | --- a/inc/riscv64/efibind.h | ||
18 | +++ b/inc/riscv64/efibind.h | ||
19 | @@ -32,11 +32,9 @@ typedef uint16_t UINT16; | ||
20 | typedef int16_t INT16; | ||
21 | typedef uint8_t UINT8; | ||
22 | typedef int8_t INT8; | ||
23 | +typedef char CHAR8; | ||
24 | typedef wchar_t CHAR16; | ||
25 | #define WCHAR CHAR16 | ||
26 | -#ifndef BOOLEAN | ||
27 | -typedef uint8_t BOOLEAN; | ||
28 | -#endif | ||
29 | #undef VOID | ||
30 | typedef void VOID; | ||
31 | typedef int64_t INTN; | ||
32 | -- | ||
33 | 2.41.0 | ||
34 | |||
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch new file mode 100644 index 0000000000..5b3c152c5e --- /dev/null +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 708f66acfec9a86f237726d45095cbd380fd83ca Mon Sep 17 00:00:00 2001 | ||
2 | From: Callum Farmer <gmbr3@opensuse.org> | ||
3 | Date: Wed, 21 Jun 2023 11:32:28 +0100 | ||
4 | Subject: [PATCH] riscv64: ignore unknown relocs | ||
5 | |||
6 | Sometimes ld emits relocs such as R_RISCV_64 for unwind symbols | ||
7 | these don't need to be handled yet so just can be skipped otherwise | ||
8 | the binary will never load | ||
9 | |||
10 | Upstream-Status: Backport [https://sourceforge.net/p/gnu-efi/code/ci/708f66acfec9a86f237726d45095cbd380fd83ca/] | ||
11 | Signed-off-by: Callum Farmer <gmbr3@opensuse.org> | ||
12 | --- | ||
13 | gnuefi/reloc_riscv64.c | 3 +-- | ||
14 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/gnuefi/reloc_riscv64.c b/gnuefi/reloc_riscv64.c | ||
17 | index 0b02d83..e429602 100644 | ||
18 | --- a/gnuefi/reloc_riscv64.c | ||
19 | +++ b/gnuefi/reloc_riscv64.c | ||
20 | @@ -81,8 +81,7 @@ EFI_STATUS EFIAPI _relocate(long ldbase, Elf_Dyn *dyn) | ||
21 | *addr = ldbase + rel->r_addend; | ||
22 | break; | ||
23 | default: | ||
24 | - /* Panic */ | ||
25 | - while (1) ; | ||
26 | + break; | ||
27 | } | ||
28 | rel = (Elf_Rela *)((char *)rel + relent); | ||
29 | relsz -= relent; | ||
30 | -- | ||
31 | 2.41.0 | ||
32 | |||
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch deleted file mode 100644 index dc00b8fa4d..0000000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 3ec8c2a70304eabd5760937a4ec3fbc4068a77ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 23 Apr 2015 01:49:31 -0700 | ||
4 | Subject: [PATCH 2/3] lib/Makefile: fix parallel issue | ||
5 | |||
6 | Fixed: | ||
7 | Assembler messages: | ||
8 | Fatal error: can't create runtime/rtlock.o: No such file or directory | ||
9 | Assembler messages: | ||
10 | Fatal error: can't create runtime/rtdata.o: No such file or directory | ||
11 | Assembler messages: | ||
12 | Fatal error: can't create runtime/vm.o: No such file or directory | ||
13 | Assembler messages: | ||
14 | Fatal error: can't create runtime/efirtlib.o: No such file or directory | ||
15 | |||
16 | Upstream-Status: Pending | ||
17 | |||
18 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
19 | --- | ||
20 | lib/Makefile | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/lib/Makefile b/lib/Makefile | ||
24 | index 048751a..ed39bbb 100644 | ||
25 | --- a/lib/Makefile | ||
26 | +++ b/lib/Makefile | ||
27 | @@ -74,6 +74,8 @@ all: libsubdirs libefi.a | ||
28 | libsubdirs: | ||
29 | for sdir in $(SUBDIRS); do mkdir -p $$sdir; done | ||
30 | |||
31 | +$(OBJS): libsubdirs | ||
32 | + | ||
33 | libefi.a: $(OBJS) | ||
34 | $(AR) $(ARFLAGS) $@ $(OBJS) | ||
35 | |||
36 | -- | ||
37 | 2.7.4 | ||
38 | |||
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/no-werror.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/no-werror.patch new file mode 100644 index 0000000000..db2bcf70b7 --- /dev/null +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/no-werror.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Do not treat warnings as errors | ||
2 | |||
3 | There are additional warnings found with musl which are | ||
4 | treated as errors and fails the build, we have more combinations | ||
5 | then upstream supports to handle | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | Upstream-Status: Inappropriate [OE specific] | ||
9 | --- a/Make.defaults | ||
10 | +++ b/Make.defaults | ||
11 | @@ -187,7 +187,7 @@ CFLAGS += $(ARCH3264) -g -O2 -Wall -Wex | ||
12 | -funsigned-char -fshort-wchar -fno-strict-aliasing \ | ||
13 | -ffreestanding -fno-stack-protector | ||
14 | else | ||
15 | -CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign -Werror \ | ||
16 | +CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign \ | ||
17 | -funsigned-char -fshort-wchar -fno-strict-aliasing \ | ||
18 | -ffreestanding -fno-stack-protector -fno-stack-check \ | ||
19 | -fno-stack-check \ | ||
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch index 8a0138bbe5..63d9b6fc31 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 48b2cdbcd761105e8ebad412fcbf23db1ac4ef7c Mon Sep 17 00:00:00 2001 | 1 | From f56ddb00a656af2e84f839738fad19909ac65047 Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | 2 | From: Saul Wold <sgw@linux.intel.com> |
3 | Date: Sun, 9 Mar 2014 15:22:15 +0200 | 3 | Date: Sun, 9 Mar 2014 15:22:15 +0200 |
4 | Subject: [PATCH 1/3] Fix parallel make failure for archives | 4 | Subject: [PATCH] Fix parallel make failure for archives |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
@@ -20,12 +20,16 @@ Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | |||
20 | [Rebased for 3.0.8] | 20 | [Rebased for 3.0.8] |
21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
22 | 22 | ||
23 | --- | ||
24 | lib/Makefile | 2 +- | ||
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
26 | |||
23 | diff --git a/lib/Makefile b/lib/Makefile | 27 | diff --git a/lib/Makefile b/lib/Makefile |
24 | index 0e6410d..048751a 100644 | 28 | index 1fc6a47..54b0ca7 100644 |
25 | --- a/lib/Makefile | 29 | --- a/lib/Makefile |
26 | +++ b/lib/Makefile | 30 | +++ b/lib/Makefile |
27 | @@ -75,7 +75,7 @@ libsubdirs: | 31 | @@ -77,7 +77,7 @@ libsubdirs: |
28 | for sdir in $(SUBDIRS); do mkdir -p $$sdir; done | 32 | $(OBJS): libsubdirs |
29 | 33 | ||
30 | libefi.a: $(OBJS) | 34 | libefi.a: $(OBJS) |
31 | - $(AR) $(ARFLAGS) $@ $^ | 35 | - $(AR) $(ARFLAGS) $@ $^ |
@@ -33,6 +37,3 @@ index 0e6410d..048751a 100644 | |||
33 | 37 | ||
34 | clean: | 38 | clean: |
35 | rm -f libefi.a *~ $(OBJS) */*.o | 39 | rm -f libefi.a *~ $(OBJS) */*.o |
36 | -- | ||
37 | 2.7.4 | ||
38 | |||