diff options
author | Tom Rini <trini@konsulko.com> | 2021-07-01 08:57:23 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-01 08:57:23 -0400 |
commit | 6b69f15fd6386770b6fe782a4a8b4ce9243e2327 (patch) | |
tree | ad79b9e1ef596dd0f0c2b0b878179535545c8d97 /include | |
parent | 90c2fd2af8189e2e2682c90cd72a48b65191b467 (diff) | |
parent | 45576273e9209309238f332c85a6fef955c49b59 (diff) | |
download | u-boot-6b69f15fd6386770b6fe782a4a8b4ce9243e2327.tar.gz |
Merge tag 'xilinx-for-v2021.10' of https://source.denx.de/u-boot/custodians/u-boot-microblaze into next
Xilinx changes for v2021.10
clk:
- Add driver for Xilinx Clocking Wizard IP
fdt:
- Also record architecture in /fit-images
net:
- Fix plat/priv data handling in axi emac
- Add support for 10G/25G speeds
pca953x:
- Add missing dependency on i2c
serial:
- Fix dependencies for DEBUG uart for pl010/pl011
- Add setconfig option for cadence serial driver
watchdog:
- Add cadence wdt expire now function
zynq:
- Update DT bindings to reflect the latest state and descriptions
zynqmp:
- Update DT bindings to reflect the latest state and descriptions
- SPL: Add support for ECC DRAM initialization
- Fix R5 core 1 handling logic
- Enable firmware driver for mini configurations
- Enable secure boot, regulators, wdt
- Add support xck devices and 67dr
- Add psu init for sm/smk-k26 SOMs
- Add handling for MMC seq number via mmc_get_env_dev()
- Handle reserved memory locations
- Add support for u-boot.itb generation for secure OS
- Handle BL32 handoffs for secure OS
- Add support for 64bit addresses for u-boot.its generation
- Change eeprom handling via nvmem aliases
Diffstat (limited to 'include')
-rw-r--r-- | include/fdt_support.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/fdt_support.h b/include/fdt_support.h index 1e4dbc0a8f..f6f46bb8e9 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -160,11 +160,12 @@ static inline void fdt_fixup_crypto_node(void *blob, int sec_rev) {} * @param entry_point entry point (if specified, otherwise pass -1) * @param type type (if specified, otherwise pass NULL) * @param os os-type (if specified, otherwise pass NULL) + * @param arch architecture (if specified, otherwise pass NULL) * @return 0 if ok, or -1 or -FDT_ERR_... on error */ int fdt_record_loadable(void *blob, u32 index, const char *name, uintptr_t load_addr, u32 size, uintptr_t entry_point, - const char *type, const char *os); + const char *type, const char *os, const char *arch); #ifdef CONFIG_PCI #include <pci.h> |