[v4] kbuild: buildtar: add dtbs support
diff mbox series

Message ID 20200627122505.GA6095@dumbo
State New
Headers show
Series
  • [v4] kbuild: buildtar: add dtbs support
Related show

Commit Message

Domenico Andreoli June 27, 2020, 12:25 p.m. UTC
From: Domenico Andreoli <domenico.andreoli@linux.com>

Make 'make tar-pkg' install dtbs.

v4:
 - Install the dtbs before modules & kernel, not after
 - Check for the dtbs_install target before attempting to invoke it

v3:
 - Check for CONFIG_OF_EARLY_FLATTREE=y instead of ARCH before installing dtbs

v2:
 - Add the kernel release to the destination path

Cc: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>

---
 scripts/package/buildtar |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Masahiro Yamada June 28, 2020, 3:46 a.m. UTC | #1
On Sat, Jun 27, 2020 at 9:25 PM Domenico Andreoli
<domenico.andreoli@linux.com> wrote:
>
> From: Domenico Andreoli <domenico.andreoli@linux.com>
>
> Make 'make tar-pkg' install dtbs.
>
> v4:
>  - Install the dtbs before modules & kernel, not after
>  - Check for the dtbs_install target before attempting to invoke it
>
> v3:
>  - Check for CONFIG_OF_EARLY_FLATTREE=y instead of ARCH before installing dtbs
>
> v2:
>  - Add the kernel release to the destination path
>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>


Applied to linux-kbuild.
Thanks.

> ---
>  scripts/package/buildtar |   12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> Index: b/scripts/package/buildtar
> ===================================================================
> --- a/scripts/package/buildtar
> +++ b/scripts/package/buildtar
> @@ -53,6 +53,18 @@ rm -rf -- "${tmpdir}"
>  mkdir -p -- "${tmpdir}/boot"
>  dirs=boot
>
> +
> +#
> +# Try to install dtbs
> +#
> +if grep -q '^CONFIG_OF_EARLY_FLATTREE=y' include/config/auto.conf; then
> +       # Only some architectures with OF support have this target
> +       if [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then
> +               $MAKE ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_DTBS_PATH="${tmpdir}/boot/dtbs/${KERNELRELEASE}" dtbs_install
> +    fi
> +fi
> +
> +
>  #
>  # Try to install modules
>  #
>
> --
> rsa4096: 3B10 0CA1 8674 ACBA B4FE  FCD2 CE5B CF17 9960 DE13
> ed25519: FFB4 0CC3 7F2E 091D F7DA  356E CC79 2832 ED38 CB05

Patch
diff mbox series

Index: b/scripts/package/buildtar
===================================================================
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -53,6 +53,18 @@  rm -rf -- "${tmpdir}"
 mkdir -p -- "${tmpdir}/boot"
 dirs=boot
 
+
+#
+# Try to install dtbs
+#
+if grep -q '^CONFIG_OF_EARLY_FLATTREE=y' include/config/auto.conf; then
+	# Only some architectures with OF support have this target
+	if [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then
+		$MAKE ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_DTBS_PATH="${tmpdir}/boot/dtbs/${KERNELRELEASE}" dtbs_install
+    fi
+fi
+
+
 #
 # Try to install modules
 #