mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>,
	rich_ogrady@grayhill.com, flix.ptxdist@benfm.de
Subject: [ptxdist] [PATCH] ptxd_make_dtb: fix dtc selection
Date: Fri, 11 Feb 2022 08:23:26 +0100	[thread overview]
Message-ID: <20220211072327.1372222-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220211072143.GA1873@pengutronix.de>

The dtc is located in the build dir not the source dir of the kernel.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 rules/post/ptxd_make_world_dtbo.make | 3 ++-
 scripts/lib/ptxd_make_world_dtb.sh   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rules/post/ptxd_make_world_dtbo.make b/rules/post/ptxd_make_world_dtbo.make
index 61babc653660..e484f35c59b5 100644
--- a/rules/post/ptxd_make_world_dtbo.make
+++ b/rules/post/ptxd_make_world_dtbo.make
@@ -11,7 +11,8 @@ world/dtbo/env = \
 	pkg_dtso_path="$($(1)_DTSO_PATH)" \
 	pkg_dtso="$($(1)_DTSO)" \
 	pkg_dtbo_dir="$($(1)_DTBO_DIR)" \
-	pkg_kernel_src="$($(1)_KERNEL_DIR)" \
+	pkg_kernel_dir="$($(1)_KERNEL_DIR)" \
+	pkg_kernel_build_dir="$($(1)_KERNEL_DIR)" \
 	pkg_arch="$(GENERIC_KERNEL_ARCH)"
 
 world/dtbo = \
diff --git a/scripts/lib/ptxd_make_world_dtb.sh b/scripts/lib/ptxd_make_world_dtb.sh
index f78d2f885114..f2eee99e4a95 100644
--- a/scripts/lib/ptxd_make_world_dtb.sh
+++ b/scripts/lib/ptxd_make_world_dtb.sh
@@ -12,9 +12,10 @@ ptxd_make_dtb() {
     dts="${dtb_source}"
     dtb="${dtb_target}"
 
-    dtb_kernel_dir="${pkg_kernel_src:-${pkg_dir}}"
+    dtb_kernel_dir="${pkg_kernel_dir:-${pkg_dir}}"
+    dtb_kernel_build_dir="${pkg_kernel_build_dir:-${pkg_build_dir}}"
 
-    dtc="${dtb_kernel_dir}/scripts/dtc/dtc"
+    dtc="${dtb_kernel_build_dir}/scripts/dtc/dtc"
     if [ ! -x "${dtc}" ]; then
 	dtc=dtc
     fi
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


      reply	other threads:[~2022-02-11  7:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <OF0FB74C20.BA6A5443-ON862587E5.004F768C-862587E5.004F8280@grayhill.com>
     [not found] ` <71d6ac45-ef44-327d-c65f-7c1a507fc22d@benfm.de>
2022-02-11  7:21   ` [ptxdist] ptxdist-2022.01.1 commit 2fafa7c4308db8d1e79dc3b5d2c9cb3400a16ff8 Michael Olbrich
2022-02-11  7:23     ` Michael Olbrich [this message]

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=20220211072327.1372222-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=flix.ptxdist@benfm.de \
    --cc=ptxdist@pengutronix.de \
    --cc=rich_ogrady@grayhill.com \
    /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