Re: [OE-core] [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB
On Thu, Jun 3, 2021 at 11:20 PM Richard Purdie wrote: > > On Thu, 2021-06-03 at 09:21 +1000, Alistair Francis wrote: > > Signed-off-by: Alistair Francis > > --- > > meta/classes/uboot-config.bbclass | 4 > > meta/recipes-bsp/u-boot/u-boot.inc | 7 ++- > > 2 files changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/meta/classes/uboot-config.bbclass > > b/meta/classes/uboot-config.bbclass > > index 3bba02828b..6444f58437 100644 > > --- a/meta/classes/uboot-config.bbclass > > +++ b/meta/classes/uboot-config.bbclass > > @@ -71,6 +71,10 @@ UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}" > > UBOOT_MKIMAGE_SIGN_ARGS ?= "" > > SPL_MKIMAGE_SIGN_ARGS ?= "" > > > > > > > > > > +# Options to deploy the u-boot device tree > > +UBOOT_DTB ?= "" > > +UBOOT_DTB_BINARY ?= "" > > + > > python () { > > ubootmachine = d.getVar("UBOOT_MACHINE") > > ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') > > I think this breaks other fitimage workflows: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/2185/steps/14/logs/stdio > > (other selftests fails similiarly) yes we should use ?? for UBOOT_DTB_BINARY otherwise it will use this assignment > > Cheers, > > Richard > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#152694): https://lists.openembedded.org/g/openembedded-core/message/152694 Mute This Topic: https://lists.openembedded.org/mt/83272059/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB
On Thu, 2021-06-03 at 09:21 +1000, Alistair Francis wrote: > Signed-off-by: Alistair Francis > --- > meta/classes/uboot-config.bbclass | 4 > meta/recipes-bsp/u-boot/u-boot.inc | 7 ++- > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/uboot-config.bbclass > b/meta/classes/uboot-config.bbclass > index 3bba02828b..6444f58437 100644 > --- a/meta/classes/uboot-config.bbclass > +++ b/meta/classes/uboot-config.bbclass > @@ -71,6 +71,10 @@ UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}" > UBOOT_MKIMAGE_SIGN_ARGS ?= "" > SPL_MKIMAGE_SIGN_ARGS ?= "" > > > > > +# Options to deploy the u-boot device tree > +UBOOT_DTB ?= "" > +UBOOT_DTB_BINARY ?= "" > + > python () { > ubootmachine = d.getVar("UBOOT_MACHINE") > ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') I think this breaks other fitimage workflows: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/2185/steps/14/logs/stdio (other selftests fails similiarly) Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#152631): https://lists.openembedded.org/g/openembedded-core/message/152631 Mute This Topic: https://lists.openembedded.org/mt/83272059/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB
Signed-off-by: Alistair Francis --- meta/classes/uboot-config.bbclass | 4 meta/recipes-bsp/u-boot/u-boot.inc | 7 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass index 3bba02828b..6444f58437 100644 --- a/meta/classes/uboot-config.bbclass +++ b/meta/classes/uboot-config.bbclass @@ -71,6 +71,10 @@ UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}" UBOOT_MKIMAGE_SIGN_ARGS ?= "" SPL_MKIMAGE_SIGN_ARGS ?= "" +# Options to deploy the u-boot device tree +UBOOT_DTB ?= "" +UBOOT_DTB_BINARY ?= "" + python () { ubootmachine = d.getVar("UBOOT_MACHINE") ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 5398c2e621..8ccc532f7e 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "kern-tools-native" -inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native +inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch DEPENDS += "swig-native" @@ -346,6 +346,11 @@ do_deploy () { ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE} ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME} fi + +if [ -n "${UBOOT_DTB}" ] +then +install -m 644 ${B}/arch/${UBOOT_ARCH}/dts/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/ +fi } addtask deploy before do_build after do_compile -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#152553): https://lists.openembedded.org/g/openembedded-core/message/152553 Mute This Topic: https://lists.openembedded.org/mt/83272059/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-