All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC
@ 2021-06-02 23:21 Alistair Francis
  2021-06-02 23:21 ` [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB Alistair Francis
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Alistair Francis @ 2021-06-02 23:21 UTC (permalink / raw)
  To: openembedded-core; +Cc: raj.khem, alistair23, Alistair Francis

Disable FW_PIC to fix the error message:

opensbi-0.9-r0 do_package_qa: QA Issue: File /share/opensbi/lp64/generic/firmware/fw_jump.elf in package opensbi doesn't have GNU_HASH (didn't pass LDFLAGS?)

This is seen in newer versions of OpenSBI that enable FW_PIC by default.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 meta/recipes-bsp/opensbi/opensbi_0.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
index cb1c3f2ebf..52965abda5 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}"
+EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n"
 # If RISCV_SBI_PAYLOAD is set then include it as a payload
 EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
 
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB
  2021-06-02 23:21 [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC Alistair Francis
@ 2021-06-02 23:21 ` Alistair Francis
  2021-06-04  6:20   ` [OE-core] " Richard Purdie
  2021-06-02 23:21 ` [PATCH 3/3] recipes-bsp/opensbi: Add support for specifying a device tree Alistair Francis
  2021-06-02 23:59 ` [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC Khem Raj
  2 siblings, 1 reply; 6+ messages in thread
From: Alistair Francis @ 2021-06-02 23:21 UTC (permalink / raw)
  To: openembedded-core; +Cc: raj.khem, alistair23, Alistair Francis

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 3/3] recipes-bsp/opensbi: Add support for specifying a device tree
  2021-06-02 23:21 [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC Alistair Francis
  2021-06-02 23:21 ` [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB Alistair Francis
@ 2021-06-02 23:21 ` Alistair Francis
  2021-06-02 23:59 ` [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC Khem Raj
  2 siblings, 0 replies; 6+ messages in thread
From: Alistair Francis @ 2021-06-02 23:21 UTC (permalink / raw)
  To: openembedded-core; +Cc: raj.khem, alistair23, Alistair Francis

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 meta/recipes-bsp/opensbi/opensbi-payloads.inc | 15 ++++++++++++++-
 meta/recipes-bsp/opensbi/opensbi_0.9.bb       |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
index 2e32943245..cc31ab3b1d 100644
--- a/meta/recipes-bsp/opensbi/opensbi-payloads.inc
+++ b/meta/recipes-bsp/opensbi/opensbi-payloads.inc
@@ -7,12 +7,25 @@ def riscv_get_extra_oemake_image(d):
 
     return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload
 
+def riscv_get_extra_oemake_fdt(d):
+    sbi_fdt = d.getVar('RISCV_SBI_FDT')
+    deploy_dir = d.getVar('DEPLOY_DIR_IMAGE')
+
+    if sbi_fdt is None:
+        return ""
+
+    return "FW_FDT_PATH=" + deploy_dir + "/" + sbi_fdt
+
 def riscv_get_do_compile_depends(d):
     sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
+    sbi_fdt = d.getVar('RISCV_SBI_FDT')
 
-    if sbi_payload is None:
+    if sbi_payload is None and sbi_fdt is None:
         return ""
 
+    if sbi_fdt is not None and 'u-boot.bin' in sbi_payload:
+        return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
+
     if 'linux' in sbi_payload or 'Image' in sbi_payload:
         return "virtual/kernel:do_deploy"
     if 'u-boot.bin' in sbi_payload:
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
index 52965abda5..5fee52136d 100644
--- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
@@ -18,6 +18,7 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n"
 # If RISCV_SBI_PAYLOAD is set then include it as a payload
 EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
+EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_fdt(d)}"
 
 # Required if specifying a custom payload
 do_compile[depends] += "${@riscv_get_do_compile_depends(d)}"
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC
  2021-06-02 23:21 [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC Alistair Francis
  2021-06-02 23:21 ` [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB Alistair Francis
  2021-06-02 23:21 ` [PATCH 3/3] recipes-bsp/opensbi: Add support for specifying a device tree Alistair Francis
@ 2021-06-02 23:59 ` Khem Raj
  2 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2021-06-02 23:59 UTC (permalink / raw)
  To: Alistair Francis
  Cc: Patches and discussions about the oe-core layer, Alistair Francis

Thanks Alistair

All three patches look good in my testing on beaglev

Acked-by: Khem Raj <raj.khem@gmail.com>

On Wed, Jun 2, 2021 at 4:21 PM Alistair Francis
<alistair.francis@wdc.com> wrote:
>
> Disable FW_PIC to fix the error message:
>
> opensbi-0.9-r0 do_package_qa: QA Issue: File /share/opensbi/lp64/generic/firmware/fw_jump.elf in package opensbi doesn't have GNU_HASH (didn't pass LDFLAGS?)
>
> This is seen in newer versions of OpenSBI that enable FW_PIC by default.
>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>  meta/recipes-bsp/opensbi/opensbi_0.9.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-bsp/opensbi/opensbi_0.9.bb b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
> index cb1c3f2ebf..52965abda5 100644
> --- a/meta/recipes-bsp/opensbi/opensbi_0.9.bb
> +++ b/meta/recipes-bsp/opensbi/opensbi_0.9.bb
> @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/riscv/opensbi.git;branch=master \
>
>  S = "${WORKDIR}/git"
>
> -EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}"
> +EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n"
>  # If RISCV_SBI_PAYLOAD is set then include it as a payload
>  EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}"
>
> --
> 2.31.1
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB
  2021-06-02 23:21 ` [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB Alistair Francis
@ 2021-06-04  6:20   ` Richard Purdie
  2021-06-06 17:07     ` Khem Raj
  0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2021-06-04  6:20 UTC (permalink / raw)
  To: Alistair Francis, openembedded-core; +Cc: raj.khem, alistair23

On Thu, 2021-06-03 at 09:21 +1000, Alistair Francis wrote:
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>  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



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB
  2021-06-04  6:20   ` [OE-core] " Richard Purdie
@ 2021-06-06 17:07     ` Khem Raj
  0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2021-06-06 17:07 UTC (permalink / raw)
  To: Richard Purdie
  Cc: Alistair Francis,
	Patches and discussions about the oe-core layer,
	Alistair Francis

On Thu, Jun 3, 2021 at 11:20 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Thu, 2021-06-03 at 09:21 +1000, Alistair Francis wrote:
> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> > ---
> >  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
>
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-06 17:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-02 23:21 [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC Alistair Francis
2021-06-02 23:21 ` [PATCH 2/3] recipes-bsp/u-boot: Allow deploying the u-boot DTB Alistair Francis
2021-06-04  6:20   ` [OE-core] " Richard Purdie
2021-06-06 17:07     ` Khem Raj
2021-06-02 23:21 ` [PATCH 3/3] recipes-bsp/opensbi: Add support for specifying a device tree Alistair Francis
2021-06-02 23:59 ` [PATCH 1/3] recipes-bsp/opensbi: Disable FW_PIC Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.