coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-16 03:25:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'seabios: Fix malloc_fn function pointer in romfile patch' (#313) from alpernebbi/lbmk:seabios-romfile-malloc-fptr into master

Browse Source 
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/313
This commit is contained in:
Leah Rowe
2025-04-29 13:55:18 +00:00
parent 686e136f15 35c853f8b3
commit 9e7bceb7fa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch
+4 -4
View File
@@ -18,7 +18,7 @@ Signed-off-by: Riku Viitanen <riku.viitanen@protonmail.com>
2 files changed, 22 insertions(+), 5 deletions(-) 2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/romfile.c b/src/romfile.c diff --git a/src/romfile.c b/src/romfile.c
index b598274e..8bf95713 100644 index b598274edc09..8ccf5139ece8 100644
--- a/src/romfile.c --- a/src/romfile.c
+++ b/src/romfile.c +++ b/src/romfile.c
@@ -47,10 +47,12 @@ romfile_find(const char *name) @@ -47,10 +47,12 @@ romfile_find(const char *name)
@@ -33,7 +33,7 @@ index b598274e..8bf95713 100644
void * void *
-romfile_loadfile(const char *name, int *psize) -romfile_loadfile(const char *name, int *psize)
+romfile_loadfile_g(const char *name, int *psize, +romfile_loadfile_g(const char *name, int *psize,
+ void *(*malloc_fn)(), int add_len) + void *(*malloc_fn)(u32), int add_len)
{ {
struct romfile_s *file = romfile_find(name); struct romfile_s *file = romfile_find(name);
if (!file) if (!file)
@@ -69,7 +69,7 @@ index b598274e..8bf95713 100644
} }
diff --git a/src/romfile.h b/src/romfile.h diff --git a/src/romfile.h b/src/romfile.h
index 3e0f8200..a320a5bc 100644 index 3e0f820047dd..1b967d86551f 100644
--- a/src/romfile.h --- a/src/romfile.h
+++ b/src/romfile.h +++ b/src/romfile.h
@@ -13,6 +13,8 @@ struct romfile_s { @@ -13,6 +13,8 @@ struct romfile_s {
@@ -77,7 +77,7 @@ index 3e0f8200..a320a5bc 100644
struct romfile_s *romfile_findprefix(const char *prefix, struct romfile_s *prev); struct romfile_s *romfile_findprefix(const char *prefix, struct romfile_s *prev);
struct romfile_s *romfile_find(const char *name); struct romfile_s *romfile_find(const char *name);
+void *romfile_loadfile_g(const char *name, int *psize, +void *romfile_loadfile_g(const char *name, int *psize,
+ void *(*malloc_fn)(), int add_len); + void *(*malloc_fn)(u32), int add_len);
void *romfile_loadfile(const char *name, int *psize); void *romfile_loadfile(const char *name, int *psize);
u64 romfile_loadint(const char *name, u64 defval); u64 romfile_loadint(const char *name, u64 defval);