colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi_loader: rename struct efi_initrd_dp to efi_lo_dp_prefix

Browse Source 
As we now also store device-tree device-paths in load options rename
struct efi_initrd_dp to efi_lo_dp_prefix.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt
2024-06-10 10:00:01 +02:00
parent e91b68fd6b
commit 535321c2ea
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/eficonfig.c
View File

@@ -1401,7 +1401,7 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo
struct efi_device_path *initrd_device_dp = NULL; struct efi_device_path *initrd_device_dp = NULL;
struct efi_device_path *fdt_device_dp = NULL; struct efi_device_path *fdt_device_dp = NULL;
const struct efi_initrd_dp initrd_prefix = { const struct efi_lo_dp_prefix initrd_prefix = {
.vendor = { .vendor = {
{ {
DEVICE_PATH_TYPE_MEDIA_DEVICE, DEVICE_PATH_TYPE_MEDIA_DEVICE,
@@ -1417,7 +1417,7 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo
} }
}; };
const struct efi_initrd_dp fdt_prefix = { const struct efi_lo_dp_prefix fdt_prefix = {
.vendor = { .vendor = {
{ {
DEVICE_PATH_TYPE_MEDIA_DEVICE, DEVICE_PATH_TYPE_MEDIA_DEVICE,

4
cmd/efidebug.c
View File

@@ -684,7 +684,7 @@ struct efi_device_path *create_lo_dp_part(const char *dev, const char *part,
struct efi_device_path *dp = NULL; struct efi_device_path *dp = NULL;
const struct efi_device_path *dp_prefix; const struct efi_device_path *dp_prefix;
efi_status_t ret; efi_status_t ret;
const struct efi_initrd_dp fdt_dp = { const struct efi_lo_dp_prefix fdt_dp = {
.vendor = { .vendor = {
{ {
DEVICE_PATH_TYPE_MEDIA_DEVICE, DEVICE_PATH_TYPE_MEDIA_DEVICE,
@@ -699,7 +699,7 @@ struct efi_device_path *create_lo_dp_part(const char *dev, const char *part,
sizeof(fdt_dp.end), sizeof(fdt_dp.end),
} }
}; };
const struct efi_initrd_dp initrd_dp = { const struct efi_lo_dp_prefix initrd_dp = {
.vendor = { .vendor = {
{ {
DEVICE_PATH_TYPE_MEDIA_DEVICE, DEVICE_PATH_TYPE_MEDIA_DEVICE,

12
include/efi_load_initrd.h
View File

@@ -18,7 +18,17 @@
0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68) 0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68)
extern const efi_guid_t efi_lf2_initrd_guid; extern const efi_guid_t efi_lf2_initrd_guid;
struct efi_initrd_dp { /**
* struct efi_lo_dp_prefix - separator device path used in load options
*
* We use vendor media device nodes in UEFI load options to separate
* the binary, initrd, and fdt device-paths. This structure contains
* the vendor media device node and an end node.
*
* @vendor: vendor media device node
* @end: end node
*/
struct efi_lo_dp_prefix {
struct efi_device_path_vendor vendor; struct efi_device_path_vendor vendor;
struct efi_device_path end; struct efi_device_path end;
} __packed; } __packed;

2
lib/efi_loader/efi_load_initrd.c
View File

@@ -24,7 +24,7 @@ static const struct efi_load_file_protocol efi_lf2_protocol = {
* Device path defined by Linux to identify the handle providing the * Device path defined by Linux to identify the handle providing the
* EFI_LOAD_FILE2_PROTOCOL used for loading the initial ramdisk. * EFI_LOAD_FILE2_PROTOCOL used for loading the initial ramdisk.
*/ */
static const struct efi_initrd_dp dp_lf2_handle = { static const struct efi_lo_dp_prefix dp_lf2_handle = {
.vendor = { .vendor = {
{ {
DEVICE_PATH_TYPE_MEDIA_DEVICE, DEVICE_PATH_TYPE_MEDIA_DEVICE,

2
lib/efi_loader/initrddump.c
View File

@@ -33,7 +33,7 @@ static bool nocolor;
* Device path defined by Linux to identify the handle providing the * Device path defined by Linux to identify the handle providing the
* EFI_LOAD_FILE2_PROTOCOL used for loading the initial ramdisk. * EFI_LOAD_FILE2_PROTOCOL used for loading the initial ramdisk.
*/ */
static const struct efi_initrd_dp initrd_dp = { static const struct efi_lo_dp_prefix initrd_dp = {
.vendor = { .vendor = {
{ {
DEVICE_PATH_TYPE_MEDIA_DEVICE, DEVICE_PATH_TYPE_MEDIA_DEVICE,