diff options
Diffstat (limited to 'poky/meta/recipes-bsp')
-rw-r--r-- | poky/meta/recipes-bsp/acpid/acpid_2.0.33.bb (renamed from poky/meta/recipes-bsp/acpid/acpid_2.0.32.bb) | 3 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc | 10 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch | 41 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-common.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb | 4 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot.inc | 6 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot_2021.10.bb (renamed from poky/meta/recipes-bsp/u-boot/u-boot_2021.07.bb) | 1 |
8 files changed, 17 insertions, 52 deletions
diff --git a/poky/meta/recipes-bsp/acpid/acpid_2.0.32.bb b/poky/meta/recipes-bsp/acpid/acpid_2.0.33.bb index 227e4a4675..7094ba2662 100644 --- a/poky/meta/recipes-bsp/acpid/acpid_2.0.32.bb +++ b/poky/meta/recipes-bsp/acpid/acpid_2.0.33.bb @@ -3,5 +3,4 @@ require acpid.inc LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5" -SRC_URI[md5sum] = "248995264b9d1cd8bdb923d5b190fd44" -SRC_URI[sha256sum] = "f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e" +SRC_URI[sha256sum] = "0856f71b3eb34a1b663d0a8e6363dfcbc519e63d847330498898658e2972dbe8" diff --git a/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc index cc31ab3b1d..e590a27573 100644 --- a/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -17,18 +17,20 @@ def riscv_get_extra_oemake_fdt(d): 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') + sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') or "" + sbi_fdt = d.getVar('RISCV_SBI_FDT') or "" - if sbi_payload is None and sbi_fdt is None: + if sbi_payload == "" and sbi_fdt == "": return "" - if sbi_fdt is not None and 'u-boot.bin' in sbi_payload: + if sbi_fdt != "" 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: return "virtual/bootloader:do_deploy" + if sbi_fdt != "": + return "virtual/kernel:do_deploy" return "" diff --git a/poky/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch b/poky/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch deleted file mode 100644 index 81687203e4..0000000000 --- a/poky/meta/recipes-bsp/u-boot/files/0001-tools-image-host-fix-wrong-return-value.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 77fe3ad2ab2953ccdf6e9417cbecc060b45d3e55 Mon Sep 17 00:00:00 2001 -From: Ming Liu <liu.ming50@gmail.com> -Date: Sun, 30 May 2021 10:32:08 +0200 -Subject: [PATCH] tools: image-host: fix wrong return value - -The return value '-ENOSPC' of fit_set_timestamp function does not match -the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'. - -Fix it by not calling fit_set_timestamp, but call fdt_setprop instead. - -This fixes a following mkimage error: -| Can't write signature for 'signature@1' signature node in -| 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error> -| mkimage Can't add hashes to FIT blob: -1 - -Upstream-Status: Submitted [ https://patchwork.ozlabs.org/project/uboot/patch/20210531070451.6561-1-liu.ming50@gmail.com ] - -Signed-off-by: Ming Liu <liu.ming50@gmail.com> ---- - tools/image-host.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/image-host.c b/tools/image-host.c -index 270d36fe45..73095461a7 100644 ---- a/tools/image-host.c -+++ b/tools/image-host.c -@@ -132,8 +132,10 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value, - if (!ret) { - time_t timestamp = imagetool_get_source_date(cmdname, - time(NULL)); -+ uint32_t t = cpu_to_uimage(timestamp); - -- ret = fit_set_timestamp(fit, noffset, timestamp); -+ ret = fdt_setprop(fit, noffset, FIT_TIMESTAMP_PROP, &t, -+ sizeof(uint32_t)); - } - if (region_prop && !ret) { - uint32_t strdata[2]; --- -2.29.0 - diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc index 6b9253806f..e41a4b5096 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "840658b093976390e9537724f802281c9c8439f5" +SRCREV = "d80bb749fab53da72c4a0e09b8c2d2aaa3103c91" SRC_URI = "git://git.denx.de/u-boot.git \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb deleted file mode 100644 index d0c0f30a98..0000000000 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb +++ /dev/null @@ -1,4 +0,0 @@ -require u-boot-common.inc -require u-boot-tools.inc - -SRC_URI:append = " file://0001-tools-image-host-fix-wrong-return-value.patch" diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb new file mode 100644 index 0000000000..7eaf721ca8 --- /dev/null +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.10.bb @@ -0,0 +1,2 @@ +require u-boot-common.inc +require u-boot-tools.inc diff --git a/poky/meta/recipes-bsp/u-boot/u-boot.inc b/poky/meta/recipes-bsp/u-boot/u-boot.inc index f27fdd5998..2d5e46f4ef 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot.inc @@ -4,6 +4,7 @@ PROVIDES = "virtual/bootloader" PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "kern-tools-native" +DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}" inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch @@ -106,6 +107,11 @@ do_compile () { oe_runmake -C ${S} O=${B} u-boot-initial-env fi fi + + if [ -n "${UBOOT_ENV}" ] && [ "${UBOOT_ENV_SUFFIX}" = "scr" ] + then + ${UBOOT_MKIMAGE} -C none -A ${UBOOT_ARCH} -T script -d ${WORKDIR}/${UBOOT_ENV_SRC} ${WORKDIR}/${UBOOT_ENV_BINARY} + fi } do_install () { diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2021.07.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2021.10.bb index c8dbe477e0..617827ff08 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot_2021.07.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot_2021.10.bb @@ -4,3 +4,4 @@ require u-boot.inc SRC_URI:append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch" DEPENDS += "bc-native dtc-native python3-setuptools-native" + |