diff options
| author | Tom Rini <[email protected]> | 2025-10-14 09:48:02 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-14 09:48:02 -0600 |
| commit | b1cc9a53d7ba8b85e77980417242420889273e86 (patch) | |
| tree | 8d8d16bedee90dba14074c4cea1dcf7a2004c9cb /include | |
| parent | 14d36cd8da298f895053764632fd58c8afe4badb (diff) | |
| parent | a040578d8270ed8788d7663808ea63ce5ffd7840 (diff) | |
Merge tag 'xilinx-for-v2026.01-rc1-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
AMD/Xilinx/FPGA changes for v2026.01-rc1 v2
zynqmp:
- DT updates
- Enable new commands
mbv:
- Simplify defconfigs
clk:
- Separate legacy handler and use SMC handler
misc:
- Tighten TTC Kconfig dependency
net:
- Add 10GBE support to Gem
pwm:
- cadence-ttc: Fix array sizes
fwu:
- Add platform hook support
spi:
- Remove undocumented cdns,is-dma property
video:
- Fix DPSUB RGB handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/fwu.h | 11 | ||||
| -rw-r--r-- | include/zynqmp_firmware.h | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/include/fwu.h b/include/fwu.h index 77e60167fc7..e7bd1d492af 100644 --- a/include/fwu.h +++ b/include/fwu.h @@ -129,6 +129,17 @@ int fwu_write_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary, uint32_t size); /** + * fwu_platform_hook() - Platform specific processing with FWU metadata + * @dev: FWU metadata device + * @data: FWU metadata + * + * Provide a platform specific function for processing with the FWU metadata. + * + * Return: 0 if OK, -ve on error + */ +int fwu_platform_hook(struct udevice *dev, struct fwu_data *data); + +/** * fwu_get_mdata() - Read, verify and return the FWU metadata * * Read both the metadata copies from the storage media, verify their checksum, diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h index 7ef8a58847f..7f93241b193 100644 --- a/include/zynqmp_firmware.h +++ b/include/zynqmp_firmware.h @@ -440,18 +440,18 @@ enum pm_gem_config_type { /* * Return payload size * Not every firmware call expects the same amount of return bytes, however the - * firmware driver always copies 5 bytes from RX buffer to the ret_payload + * firmware driver always copies 7 words from RX buffer to the ret_payload * buffer. Therefore allocating with this defined value is recommended to avoid * overflows. */ -#define PAYLOAD_ARG_CNT 5U +#define PAYLOAD_ARG_CNT 7U unsigned int zynqmp_firmware_version(void); int zynqmp_pmufw_node(u32 id); int zynqmp_pmufw_config_close(void); int zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size); int xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, - u32 arg3, u32 *ret_payload); + u32 arg3, u32 arg4, u32 arg5, u32 *ret_payload); int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value); int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config, u32 value); @@ -517,7 +517,7 @@ struct zynqmp_ipi_msg { #define __data __section(".data") typedef int (*smc_call_handler_t)(u32 api_id, u32 arg0, u32 arg1, u32 arg2, - u32 arg3, u32 *ret_payload); + u32 arg3, u32 arg4, u32 arg5, u32 *ret_payload); extern smc_call_handler_t __data smc_call_handler; |
