kotovalexarian-likes-gitlab/bztsrc--bootboot
1
0
Fork 0
mirror of https://gitlab.com/bztsrc/bootboot.git synced 2023-02-13 20:54:32 -05:00
Code Releases Activity

Updated to use the new CBFS interface

Browse source
This commit is contained in:
bzt 2022-04-14 19:26:44 +02:00
parent 2569d289c2
commit b9f264f4cb
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
x86_64-cb/bootboot.c
View file

@ -836,8 +836,9 @@ int main(void)
/* if it's on the CBFS filesystem in the COREBOOT Flashmap area */ /* if it's on the CBFS filesystem in the COREBOOT Flashmap area */
if(!initrd.ptr || !initrd.size) { if(!initrd.ptr || !initrd.size) {
size_t s; size_t s;
struct cbfs_handle *file = cbfs_get_handle(CBFS_DEFAULT_MEDIA, "bootboot/initrd"); initrd.ptr = cbfs_map("bootboot/initrd", &s);
if(file) { initrd.ptr = cbfs_get_contents(file, &s, 16*1024*1024); initrd.size = s; } if(initrd.ptr && s > 1 && s < 16*1024*1024) initrd.size = s;
else initrd.ptr = NULL;
} }
#endif #endif
// skip optional ROM header // skip optional ROM header
@ -1074,11 +1075,8 @@ gzerr: panic("Unable to uncompress");
if(!environment[0]) { if(!environment[0]) {
// if there's no environment on the boot partition neither inside the INITRD, but we have CBFS support, try that too // if there's no environment on the boot partition neither inside the INITRD, but we have CBFS support, try that too
size_t s; size_t s;
struct cbfs_handle *file = cbfs_get_handle(CBFS_DEFAULT_MEDIA, "bootboot/config"); ptr = cbfs_map("bootboot/config", &s);
if(file) { if(ptr && s > 1 && s < PAGESIZE-1) memcpy(environment, ptr, s);
ptr = cbfs_get_contents(file, &s, PAGESIZE-1);
if(ptr && s) memcpy(environment, ptr, s);
}
} }
#endif #endif
ParseEnvironment((uint8_t*)environment); ParseEnvironment((uint8_t*)environment);