From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v5] U-Boot: Add option to disable OOT builds
Date: Tue, 25 Jan 2022 15:57:27 +0100 [thread overview]
Message-ID: <20220125145727.6095-1-christian.melki@t2data.com> (raw)
This option sometimes breaks builds with various external dependencies.
Especially vendor trees that have sourcedir path references.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
platforms/u-boot.in | 10 ++++++++++
rules/u-boot.make | 6 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/platforms/u-boot.in b/platforms/u-boot.in
index d5410e4a1..6589a1940 100644
--- a/platforms/u-boot.in
+++ b/platforms/u-boot.in
@@ -20,6 +20,16 @@ config U_BOOT_MD5
string
prompt "U-Boot source md5"
+config U_BOOT_BUILD_OOT
+ prompt "Out of tree build"
+ default y
+ bool
+ help
+ U-Boot is usually built out of tree.
+ But for some builds, f.ex. with firmware blobs, out of tree builds
+ can break because of vendors using source paths to files.
+ Disable OOT build if you need a workaround for those type of builds.
+
choice
prompt "config system"
default U_BOOT_CONFIGSYSTEM_LEGACY
diff --git a/rules/u-boot.make b/rules/u-boot.make
index 38c32bf27..38faf190c 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -23,9 +23,9 @@ U_BOOT_SUFFIX := tar.bz2
U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
-U_BOOT_BUILD_DIR := $(U_BOOT_DIR)-build
+U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,-build)
U_BOOT_DEVPKG := NO
-U_BOOT_BUILD_OOT := KEEP
+U_BOOT_BUILD_OOT := $(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,KEEP,NO)
ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG
U_BOOT_CONFIG := $(call ptx/in-platformconfigdir, \
@@ -54,7 +54,7 @@ U_BOOT_WRAPPER_BLACKLIST := \
U_BOOT_CONF_OPT := \
-C $(U_BOOT_DIR) \
- O=$(U_BOOT_BUILD_DIR) \
+ $(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,O=$(U_BOOT_BUILD_DIR)) \
V=$(PTXDIST_VERBOSE) \
$(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_OPTS))
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next reply other threads:[~2022-01-25 14:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 14:57 Christian Melki [this message]
2022-01-26 8:18 ` Alexander Dahl
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220125145727.6095-1-christian.melki@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox