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 /common | |
| parent | 90c2fd2af8189e2e2682c90cd72a48b65191b467 (diff) | |
| parent | 45576273e9209309238f332c85a6fef955c49b59 (diff) | |
| download | u-boot-6b69f15fd6386770b6fe782a4a8b4ce9243e2327.zip u-boot-6b69f15fd6386770b6fe782a4a8b4ce9243e2327.tar.gz u-boot-6b69f15fd6386770b6fe782a4a8b4ce9243e2327.tar.bz2 | |
Merge tag 'xilinx-for-v2021.10' of https://source.denx.de/u-boot/custodians/u-boot-microblaze into nextWIP/01Jul2021-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 'common')
| -rw-r--r-- | common/fdt_support.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index a9a32df..240f1e5 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -594,7 +594,7 @@ void fdt_fixup_ethernet(void *fdt) 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) { int err, node; @@ -622,6 +622,8 @@ int fdt_record_loadable(void *blob, u32 index, const char *name, fdt_setprop_string(blob, node, "type", type); if (os) fdt_setprop_string(blob, node, "os", os); + if (arch) + fdt_setprop_string(blob, node, "arch", arch); return node; } diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 57d621d..f41abca 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -480,7 +480,8 @@ static int spl_fit_record_loadable(const struct spl_fit_info *ctx, int index, ret = fdt_record_loadable(blob, index, name, image->load_addr, image->size, image->entry_point, fdt_getprop(ctx->fit, node, "type", NULL), - fdt_getprop(ctx->fit, node, "os", NULL)); + fdt_getprop(ctx->fit, node, "os", NULL), + fdt_getprop(ctx->fit, node, "arch", NULL)); return ret; } |