67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
From: Michal Simek <michal.simek@amd.com>
|
|
Date: Fri, 1 Nov 2024 10:17:54 +0100
|
|
Subject: [PATCH] binman: Add option for pointing to separate description
|
|
|
|
Adding binman node with target images description can be unwanted feature
|
|
but as of today there is no way to disable it.
|
|
Also on size constrained systems it is not useful to add binman description
|
|
to DTB.
|
|
Introduce BINMAN_DTB Kconfig symbol which allows separate DTB for target
|
|
from DTB for binman itself.
|
|
|
|
Signed-off-by: Michal Simek <michal.simek@amd.com>
|
|
Link: https://lore.kernel.org/r/f1379d2587f9bf279a7a75c318aabbc1b35ee0c6.1730452668.git.michal.simek@amd.com
|
|
Upstream: https://source.denx.de/u-boot/u-boot/-/commit/d92fdb60677b3990919a4216d3452418db215224
|
|
---
|
|
Makefile | 11 ++++++++++-
|
|
lib/Kconfig | 9 +++++++++
|
|
2 files changed, 19 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index f049d77dcaf..cb0ff66eccf 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1337,12 +1337,21 @@ u-boot.ldr: u-boot
|
|
# Use 'make BINMAN_VERBOSE=3' to set vebosity level
|
|
default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE))
|
|
|
|
+binman_dtb := $(shell echo $(CONFIG_BINMAN_DTB))
|
|
+ifeq ($(strip $(binman_dtb)),)
|
|
+ifeq ($(CONFIG_OF_EMBED),y)
|
|
+binman_dtb = ./dts/dt.dtb
|
|
+else
|
|
+binman_dtb = ./u-boot.dtb
|
|
+endif
|
|
+endif
|
|
+
|
|
quiet_cmd_binman = BINMAN $@
|
|
cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
|
|
$(foreach f,$(BINMAN_TOOLPATHS),--toolpath $(f)) \
|
|
--toolpath $(objtree)/tools \
|
|
$(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \
|
|
- build -u -d u-boot.dtb -O . -m \
|
|
+ build -u -d $(binman_dtb) -O . -m \
|
|
--allow-missing $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \
|
|
-I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \
|
|
-I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \
|
|
diff --git a/lib/Kconfig b/lib/Kconfig
|
|
index d47df6bb1cf..a1ee51e6eae 100644
|
|
--- a/lib/Kconfig
|
|
+++ b/lib/Kconfig
|
|
@@ -45,6 +45,15 @@ config BINMAN_FDT
|
|
locate entries in the firmware image. See binman.h for the available
|
|
functionality.
|
|
|
|
+config BINMAN_DTB
|
|
+ string "binman DTB description"
|
|
+ depends on BINMAN
|
|
+ help
|
|
+ This enables option to point to different DTB file with binman node which
|
|
+ is outside of DTB used by the firmware. Use this option if information
|
|
+ about generated images shouldn't be the part of target binary. Or on system
|
|
+ with limited storage.
|
|
+
|
|
config CC_OPTIMIZE_LIBS_FOR_SPEED
|
|
bool "Optimize libraries for speed"
|
|
help
|