mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge tag 'efi-2026-01-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2026-01-rc2 CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/28208 Documentation: * bootstd: Describe environment variable extension_overlay_addr environment and remove extension support from TODO list EFI: * Correct the detection of the video mode in the EFI payload app: - Use struct efi_gop_mode_info in the definition of struct efi_entry_gopmode. - In function get_mode_from_entry() use the correct type for the video mode structure. * Use a valid error code as return value in efi_store_memory_map(). * Avoid a memory leak for the variable name in efi_bl_create_block_device(). * Correct the code indentation in efi_uc_stop(). * Correct the description of struct efi_priv. * Fix typos in code comments. Other: * qfw: Add more fields and a heading to qfw list * Fix the support for ACPI pass-through on ARM and RISC-V: Avoid zeroing out the XSDT address * test: provide unit test for 'acpi list' command # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmkNj/kACgkQxIHbvCwF # GsS8NQ/6Aj+Z54HJTIEfoXssvElLr5ATactrCxszq42i/yy6dLqa2Ym1afG6w1XS # 1ZbCeU/bCXFke5Tsz+x89gEfckUm83oTwngwcID0WR1qn8mWjwR7tM5MuORq8NxU # 7NwLuFs9O/QZihagKdz6hv1/Y+cBwiAYLY16EYVSuUlbLaKQo3QvxwWkqG3jdKWV # Rm58/PolU+2h04MBwP0SxSduX4OyRF/tMOGjf5RGLyqCyj8kIgdu7PvUAPMM+Gps # KemL59V0Bdv8hlF4JknmPz+idtZg2nHIDdNrBZvoxwzwGQeRZ1YXAMruRxZXqDYL # tiuDp6HMv/GfIIGkz14tJtJMdboaAybAnluPWGalx8JQJqJzEPww0R+9s4KKQeWL # mHgRyl6PxVV9p19f79Qq6q6ETwrFDX0YH3pdrGUk3DBa3lDt0UsEAnuW4FvaJ8tx # 3PMrjKAxpxocT0hglsMVnptnfvDEigMsjwH/TWrau83mY+juxFQLjm+U4vye+qCa # 4zXjjLas18+eRcrv2KxU7teakyi1Jp+WbqHq37L26YcQMaLq/RkBc0bTrsreKKLu # jprYFpvc7EJpH2Fd1XWaZ2EnxXcVSJSvrY/iwRQqb6wbwQ6XGtMvSh3IFY8IzAoh # N2Pj78oaYqyL1q/TftuZWhEHo3a0M/HfM4D+oMSHzJtWCb0wZHE= # =OGcS # -----END PGP SIGNATURE----- # gpg: Signature made Fri 07 Nov 2025 12:21:45 AM CST # gpg: using RSA key 6DC4F9C71F29A6FA06B76D33C481DBBC2C051AC4 # gpg: Good signature from "Heinrich Schuchardt <xypron.glpk@gmx.de>" [unknown] # gpg: aka "[jpeg image of size 1389]" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 6DC4 F9C7 1F29 A6FA 06B7 6D33 C481 DBBC 2C05 1AC4
This commit is contained in:
@@ -385,6 +385,28 @@ struct efi_entry_memmap {
|
||||
struct efi_mem_desc desc[];
|
||||
};
|
||||
|
||||
/**
|
||||
* struct efi_gop_mode_info - graphics output mode information
|
||||
*/
|
||||
struct efi_gop_mode_info {
|
||||
/** @version: version of the data structure (use zero) */
|
||||
u32 version;
|
||||
/** @width: horizontal screen size */
|
||||
u32 width;
|
||||
/** @height: vertical screen size */
|
||||
u32 height;
|
||||
/** @pixel_format: enum that specifies the storage format of pixels */
|
||||
u32 pixel_format;
|
||||
/**
|
||||
* @pixel_bitmask: bitmasks used with PixelPixelBitMask
|
||||
*
|
||||
* The values which bits are used for red, green, blue, and alpha.
|
||||
*/
|
||||
u32 pixel_bitmask[4];
|
||||
/** @pixels_per_scanline: pixels per video memory line */
|
||||
u32 pixels_per_scanline;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct efi_entry_gopmode - a GOP mode table passed to U-Boot
|
||||
*
|
||||
@@ -404,19 +426,7 @@ struct efi_entry_gopmode {
|
||||
*/
|
||||
u64 fb_size;
|
||||
u64 info_size;
|
||||
/*
|
||||
* We cannot directly use 'struct efi_gop_mode_info info[]' here as
|
||||
* it causes compiler to complain: array type has incomplete element
|
||||
* type 'struct efi_gop_mode_info'.
|
||||
*/
|
||||
struct /* efi_gop_mode_info */ {
|
||||
u32 version;
|
||||
u32 width;
|
||||
u32 height;
|
||||
u32 pixel_format;
|
||||
u32 pixel_bitmask[4];
|
||||
u32 pixels_per_scanline;
|
||||
} info[];
|
||||
struct efi_gop_mode_info info[];
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -444,7 +454,7 @@ static inline struct efi_mem_desc *efi_get_next_mem_desc(
|
||||
* @memmap_key: Key returned from get_memory_map()
|
||||
* @memmap_desc: List of memory-map records
|
||||
* @memmap_alloc: Amount of memory allocated for memory map list
|
||||
* @memmap_size Size of memory-map list in bytes
|
||||
* @memmap_size: Size of memory-map list in bytes
|
||||
* @memmap_desc_size: Size of an individual memory-map record, in bytes
|
||||
* @memmap_version: Memory-map version
|
||||
*
|
||||
|
||||
@@ -1490,15 +1490,6 @@ struct efi_hii_config_access_protocol {
|
||||
#define EFI_GOT_BGRA8 1
|
||||
#define EFI_GOT_BITMASK 2
|
||||
|
||||
struct efi_gop_mode_info {
|
||||
u32 version;
|
||||
u32 width;
|
||||
u32 height;
|
||||
u32 pixel_format;
|
||||
u32 pixel_bitmask[4];
|
||||
u32 pixels_per_scanline;
|
||||
};
|
||||
|
||||
struct efi_gop_mode {
|
||||
u32 max_mode;
|
||||
u32 mode;
|
||||
|
||||
Reference in New Issue
Block a user