mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-04-19 14:55:07 +01:00
0cea72c1cc
Set default U-Boot revision to v2024.10 and rebase patches on top of that. The video subsystem now has switched to using the 'cyclic' mechanism, so the code around one of the video patches changed a bit. x86 boards were already switched to v2024.10. Update U-Boot for the remaining ARM64 boards as usual: - Turn old configs into defconfigs (./update trees -s u-boot) - Save the diff from old upstream defconfig (diffconfig $theirs $ours) - Update U-Boot revision, rebase patches, and clean old trees - Prepare new U-Boot tree (./update trees -f u-boot) - Review the diffconfigs to see if any options were renamed upstream - Copy over the new upstream defconfigs and apply earlier diff - Turn new defconfigs into configs (./update trees -l u-boot) Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From ec8f5b8e949995eb34b7e54b9f06894eb38d02b4 Mon Sep 17 00:00:00 2001
|
|
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
|
|
Date: Wed, 10 Jul 2024 17:37:56 +0300
|
|
Subject: [PATCH] HACK: Makefile: Ignore missing input files for binman images
|
|
|
|
For Rockchip boards binman tries to build SPI and MMC images that
|
|
require an externally built BL31 file to be provided, and the build
|
|
fails otherwise.
|
|
|
|
Some downstreams only care about build outputs for U-Boot proper. As a
|
|
hack to make sure they can do so without passing in a BL31 file, tell
|
|
binman to ignore missing input files.
|
|
|
|
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
|
|
---
|
|
Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 34dd029d0cda..d5d89bd2e35c 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1375,7 +1375,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
|
|
--toolpath $(objtree)/tools \
|
|
$(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \
|
|
build -u -d u-boot.dtb -O . -m \
|
|
- --allow-missing $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \
|
|
+ --allow-missing --ignore-missing \
|
|
-I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \
|
|
-I $(dt_dir) -a of-list=$(CONFIG_OF_LIST) \
|
|
$(foreach f,$(BINMAN_INDIRS),-I $(f)) \
|
|
--
|
|
2.45.2
|
|
|