diff options
| author | Tom Rini <[email protected]> | 2025-10-27 09:46:51 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-27 09:46:51 -0600 |
| commit | c95334515f413d6d271311d3ad27b58964ae4dd4 (patch) | |
| tree | d0aa49d6b0a9b4a84e432ce75d777182e781e4cf /scripts | |
| parent | 9094482ca7576877b2bfaa57c8e73cfeb536f8b9 (diff) | |
| parent | fa4dfe870c16a90ed14be92f5f3a3822a7ecfe9a (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
No big features this time, mostly a collection of patches that have been
lying around for a bit. There are some DT updates, for those SoCs that
do not use OF_UPSTREAM yet, hopefully that's the last time we need to do
this exercise. And that's offset by switching over two more SoCs to
OF_UPSTREAM. Two new boards get a defconfig, and some improvements for
the sun8i-emac Ethernet driver. Finally a patch that fixes occassional
DRAM size misdetection for new A523 boards.
There are a few outstanding patches that just wait for getting some
details confirmed, which I might send then later.
CI passed, and I tested this briefly on affected boards.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.xpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl index 3e940bf562d..52f014ad332 100644 --- a/scripts/Makefile.xpl +++ b/scripts/Makefile.xpl @@ -442,7 +442,8 @@ MKIMAGEFLAGS_sunxi-spl.bin = \ -A $(ARCH) \ -T $(CONFIG_SPL_IMAGE_TYPE) \ -a $(CONFIG_SPL_TEXT_BASE) \ - -n $(CONFIG_DEFAULT_DEVICE_TREE) + -n $(CONFIG_DEFAULT_DEVICE_TREE) \ + $(if $(KEYDIR),-k $(KEYDIR)) OBJCOPYFLAGS_u-boot-spl-dtb.hex := -I binary -O ihex --change-address=$(CONFIG_SPL_TEXT_BASE) |