trusted-firmware-a: remove no-longer-required patches
PATCH 1/2 trusted-firmware-a: remove no-longer-required patches
The two patches being carried in this layer for tf-a are no longer required and can be dropped.
--- .../0001-dram-Fix-build-with-gcc-11.patch | 35 ------------------- ...rk-already-defined-functions-as-weak.patch | 35 ------------------- .../trusted-firmware-a_%.bbappend | 7 ---- 3 files changed, 77 deletions(-) delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch
recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From a09a1de53aba422249a8376b0d95024200021317 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 11 May 2021 11:55:31 -0700 -Subject: [PATCH] dram: Fix build with gcc 11 - -This is a redundant assignment which GCC warns about. - -Fixes - -plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c:781:11: error: explicitly assigning value of variable of type 'uint32_t' (aka 'unsigned int') to itself [-Werror,-Wself-assign] - twr_tmp = twr_tmp; - ~~~~~~~ ^ ~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c -index 3cdb7a296..76bc5ee96 100644 ---- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c -+++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c -@@ -778,7 +778,7 @@ static void lpddr3_get_parameter(struct timing_related_config *timing_config, - else if (twr_tmp <= 8) - twr_tmp = 8; - else if (twr_tmp <= 12) -- twr_tmp = twr_tmp; -+ ; /* do nothing */ - else if (twr_tmp <= 14) - twr_tmp = 14; - else --- -2.31.1 -
recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 9d963cd69faf94bdcb80624132fd10392f57875b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 11 May 2021 12:11:51 -0700 -Subject: [PATCH] pmu: Do not mark already defined functions as weak - -These functions are already defined as static functions in same header -Fixes - -| plat/rockchip/common/drivers/pmu/pmu_com.h:35:14: error: weak identifier 'pmu_power_domain_ctr' never declared [-Werror] | #pragma weak pmu_power_domain_ctr | ^ -| plat/rockchip/common/drivers/pmu/pmu_com.h:36:14: error: weak identifier 'check_cpu_wfie' never declared [-Werror] -| #pragma weak check_cpu_wfie -| ^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - plat/rockchip/common/drivers/pmu/pmu_com.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/plat/rockchip/common/drivers/pmu/pmu_com.h b/plat/rockchip/common/drivers/pmu/pmu_com.h -index 5359f73b4..3f9ce7df9 100644 ---- a/plat/rockchip/common/drivers/pmu/pmu_com.h -+++ b/plat/rockchip/common/drivers/pmu/pmu_com.h -@@ -32,8 +32,6 @@ enum pmu_pd_state { - }; - - #pragma weak plat_ic_get_pending_interrupt_id --#pragma weak pmu_power_domain_ctr --#pragma weak check_cpu_wfie - - static inline uint32_t pmu_power_domain_st(uint32_t pd) - { --- -2.31.1 -
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +0 -7
@@ -9,13 +9,6 @@ COMPATIBLE_MACHINE:append:rk3566 = "|rk3566" COMPATIBLE_MACHINE:append:rk3568 = "|rk3568" COMPATIBLE_MACHINE:append:rk3588s = "|rk3588s" -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI += "\ - file://0001-dram-Fix-build-with-gcc-11.patch \ - file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \ -" - - # code bloats with clang and results in error below now # | aarch64-yoe-linux-musl-ld: region `PMUSRAM' overflowed by 3928 bytes # this needs fixing until then use gcc
Signature · 1 line
2.44.0.501.g19981daefd7c
PATCH 2/2 fitimage rework
oe-core has completely re-written the fitImage support starting roughly at commit [1], update meta-rockchip to match.
Most of the MACHINEs in meta-rockchip use a fitImage, but some don't. Create a boolean variable (RK_FITIMAGE), enabled by default, to keep track of which ones do and which ones don't. Use this variable to decide how to configure various image-related fields.
Run tested on the following with RAUC configured:
- nanopi-m4b
- nanopi-r2s
- radxa-zero-3e
- rock-pi-4b
- rock-pi-e
- rock-pi-s
Run tested on the following without RAUC:
- radxa-zero-3e
- rock-pi-e
- rock-pi-s
[1] oe-core: 3442d9297dca ("oe-selftest: fitimage: test external dtb")
--- conf/machine/include/px30.inc | 3 +-- conf/machine/include/rk3066.inc | 1 + conf/machine/include/rk3188.inc | 1 + conf/machine/include/rk3288.inc | 1 + conf/machine/include/rk3308.inc | 3 +-- conf/machine/include/rk3328.inc | 3 +-- conf/machine/include/rk3399.inc | 3 +-- conf/machine/include/rk3566.inc | 3 +-- conf/machine/include/rk3568.inc | 3 +-- conf/machine/include/rk3588s.inc | 3 +-- conf/machine/include/rockchip-defaults.inc | 2 ++ conf/machine/include/rockchip-extlinux.inc | 8 ++++---- conf/machine/include/rockchip-fitimage.inc | 4 ++++ 13 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 conf/machine/include/rockchip-fitimage.inc
conf/machine/include/px30.inc +1 -2
@@ -11,8 +11,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "px30" TFA_BUILD_TARGET = "bl31"
conf/machine/include/rk3066.inc +1 -0
@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"
conf/machine/include/rk3188.inc +1 -0
@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyFIQ0" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"
conf/machine/include/rk3288.inc +1 -0
@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa17.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"
conf/machine/include/rk3308.inc +1 -2
@@ -13,8 +13,7 @@ SERIAL_CONSOLES = "1500000;ttyS0" KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3308 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000"
conf/machine/include/rk3328.inc +1 -2
@@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31"
conf/machine/include/rk3399.inc +1 -2
@@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31"
conf/machine/include/rk3566.inc +1 -2
@@ -11,8 +11,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"
conf/machine/include/rk3568.inc +1 -2
@@ -11,8 +11,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3568 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"
conf/machine/include/rk3588s.inc +1 -2
@@ -10,8 +10,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3588s = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"
conf/machine/include/rockchip-defaults.inc +2 -0
@@ -1,7 +1,9 @@ # meta-rockchip default settings MACHINEOVERRIDES =. "${@bb.utils.contains('ROCKCHIP_CLOSED_TPL', '1', 'closed-tpl:', '', d)}" MACHINEOVERRIDES =. "rockchip:" + # kernel +RK_FITIMAGE ?= "True" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig"
conf/machine/include/rockchip-extlinux.inc +4 -4
@@ -13,13 +13,13 @@ NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" UBOOT_EXTLINUX ?= "1" UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=rootfsA" -UBOOT_EXTLINUX_FDTDIR ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot', d)}" -UBOOT_EXTLINUX_FDT ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot/${NONFITDT}', d)}" +UBOOT_EXTLINUX_FDTDIR ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot'}" +UBOOT_EXTLINUX_FDT ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot/${NONFITDT}'}" UBOOT_EXTLINUX_CONSOLE ?= "earlycon console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8" UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait rw rootfstype=ext4" -UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${KERNEL_IMAGETYPE}" +UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${@ 'fitImage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '${KERNEL_IMAGETYPE}'}" UBOOT_EXTLINUX_LABELS ?= "default" UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', 'kernel-devicetree', d)}" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${@ 'linux-yocto-fitimage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else 'kernel-devicetree'}"
conf/machine/include/rockchip-fitimage.inc new file +4 -0
@@ -0,0 +1,4 @@ +KERNEL_CLASSES += "kernel-fit-extra-artifacts" +KERNEL_IMAGETYPE = "Image" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" +KERNEL_DEPLOY_DEPEND = "linux-yocto-fitimage:do_deploy"
Signature · 1 line
2.44.0.501.g19981daefd7c
Re: [yocto-patches] [meta-rockchip][PATCH 2/2] fitimage rework
Hi Trevor,
Quoted 3 lines · Trevor Woerner via lists.yoctoproject.org
oe-core has completely re-written the fitImage support starting roughly at commit [1], update meta-rockchip to match.
Thanks for looking into that!
Quoted 20 lines
Most of the MACHINEs in meta-rockchip use a fitImage, but some don't. Create a boolean variable (
RK_FITIMAGE), enabled by default, to keep track of which ones do and which ones don't. Use this variable to decide how to configure various image-related fields.Run tested on the following with RAUC configured:
- nanopi-m4b
- nanopi-r2s
- radxa-zero-3e
- rock-pi-4b
- rock-pi-e
- rock-pi-sRun tested on the following without RAUC:
- radxa-zero-3e
- rock-pi-e
- rock-pi-s[1] oe-core:
3442d9297dca("oe-selftest: fitimage: test external dtb")Signed-off-by Trevor Woerner <[email protected]>
Quoted 14 lines
--- conf/machine/include/px30.inc | 3 +-- conf/machine/include/rk3066.inc | 1 + conf/machine/include/rk3188.inc | 1 + conf/machine/include/rk3288.inc | 1 + conf/machine/include/rk3308.inc | 3 +-- conf/machine/include/rk3328.inc | 3 +-- conf/machine/include/rk3399.inc | 3 +-- conf/machine/include/rk3566.inc | 3 +-- conf/machine/include/rk3568.inc | 3 +-- conf/machine/include/rk3588s.inc | 3 +-- conf/machine/include/rockchip-defaults.inc | 2 ++ conf/machine/include/rockchip-extlinux.inc | 8 ++++---- conf/machine/include/rockchip-fitimage.inc | 4 ++++
Missing info in the top README about this new variable I believe?
Quoted 8 lines
13 files changed, 20 insertions(+), 18 deletions(-)create mode 100644 conf/machine/include/rockchip-fitimage.inc
conf/machine/include/px30.inc +0
-0
conf/machine/include/px30.inc require conf/machine/include/arm/armv8a/tune-cortexa35.inc · line 14
Quoted 6 lines
conf/machine/include/px30.inc +1
-2@@ -11,8 +11,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc
question: should this be only included when RK_FITIMAGE = "True"?
some sort of inherit_defer but for require? Or maybe we should set the variables in rockchip-fitimage only if RK_FITIMAGE = "True" and leave them as is if False?
It seems like SoCs with RK_FITIMAGE = "False" should not inherit rockchip-fitimage.inc and those with True should? What happens if you have a board outside of meta-rockchip with px30 which you don't want to support fitImage by default (that's my case, so I guess I'll need to build this to figure it out :) ).
Quoted 128 lines
conf/machine/include/px30.inc +0
-0TFA_PLATFORM = "px30" TFA_BUILD_TARGET = "bl31"conf/machine/include/rk3066.inc +1
-0@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"conf/machine/include/rk3188.inc +1
-0@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyFIQ0" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"conf/machine/include/rk3288.inc +1
-0@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa17.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"conf/machine/include/rk3308.inc +1
-2@@ -13,8 +13,7 @@ SERIAL_CONSOLES = "1500000;ttyS0" KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3308 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000"conf/machine/include/rk3328.inc +1
-2@@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31"conf/machine/include/rk3399.inc +1
-2@@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31"conf/machine/include/rk3566.inc +1
-2@@ -11,8 +11,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"conf/machine/include/rk3568.inc +1
-2@@ -11,8 +11,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3568 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"conf/machine/include/rk3588s.inc +1
-2@@ -10,8 +10,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3588s = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"conf/machine/include/rockchip-defaults.inc +0
-0
conf/machine/include/rockchip-defaults.inc line 6
Quoted 6 lines
conf/machine/include/rockchip-defaults.inc +2
-0@@ -1,7 +1,9 @@ # meta-rockchip default settings MACHINEOVERRIDES =. "${@bb.utils.contains('ROCKCHIP_CLOSED_TPL', '1', 'closed-tpl:', '', d)}" MACHINEOVERRIDES =. "rockchip:" + # kernel +RK_FITIMAGE ?= "True"
What about using a more typical 0/1 like we do for other variables? ENABLE_STATELESS_VPU_GST or RKBIN_DDR_RECONFIGURE for example?
Quoted 8 lines
conf/machine/include/rockchip-defaults.inc +0
-0PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig"conf/machine/include/rockchip-extlinux.inc +0
-0
conf/machine/include/rockchip-extlinux.inc NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" · line 17
Quoted 7 lines
conf/machine/include/rockchip-extlinux.inc +2
-2@@ -13,13 +13,13 @@ NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" UBOOT_EXTLINUX ?= "1" UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=rootfsA" -UBOOT_EXTLINUX_FDTDIR ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot', d)}" -UBOOT_EXTLINUX_FDT ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot/${NONFITDT}', d)}" +UBOOT_EXTLINUX_FDTDIR ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot'}" +UBOOT_EXTLINUX_FDT ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot/${NONFITDT}'}"
I guess you can avoid the ,False part as the default is None, which should fail your if condition. Just a matter of taste though.
conf/machine/include/rockchip-extlinux.inc NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" · line 20
Quoted 4 lines
conf/machine/include/rockchip-extlinux.inc +1
-1UBOOT_EXTLINUX_CONSOLE ?= "earlycon console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8" UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait rw rootfstype=ext4" -UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${KERNEL_IMAGETYPE}" +UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${@ 'fitImage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '${KERNEL_IMAGETYPE}'}"
Ditto.
Quoted 12 lines
conf/machine/include/rockchip-extlinux.inc +1
-1UBOOT_EXTLINUX_LABELS ?= "default" UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', 'kernel-devicetree', d)}" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${@ 'linux-yocto-fitimage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else 'kernel-devicetree'}"conf/machine/include/rockchip-fitimage.inc new file +0
-0
conf/machine/include/rockchip-fitimage.inc line 4
Quoted 4 lines
conf/machine/include/rockchip-fitimage.inc new file +4
-0@@ -0,0 +1,4 @@ +KERNEL_CLASSES += "kernel-fit-extra-artifacts" +KERNEL_IMAGETYPE = "Image" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" +KERNEL_DEPLOY_DEPEND = "linux-yocto-fitimage:do_deploy"
Should this be a ?= so that we can easily override/change it?
Looks ok to me otherwise, I have px30, rk3399 and rk3588 boards which do not use fit images so I'll try to check this next week. Considering meta-rockchip doesn't build at all anymore, I guess you may want to fix this ASAP your way and I can figure out a way to fix it up "further" for non-fitimages scenario?).
Cheers,
Quentin
Re: [yocto-patches] [meta-rockchip][PATCH 2/2] fitimage rework
Quoted 66 lines · Quentin Schulz via lists.yoctoproject.org
Hi Trevor,
Quoted 3 lines · Trevor Woerner via lists.yoctoproject.org
oe-core has completely re-written the fitImage support starting roughly at commit [1], update meta-rockchip to match.
Thanks for looking into that!
Quoted 20 lines
Most of the MACHINEs in meta-rockchip use a fitImage, but some don't. Create a boolean variable (
RK_FITIMAGE), enabled by default, to keep track of which ones do and which ones don't. Use this variable to decide how to configure various image-related fields.Run tested on the following with RAUC configured:
- nanopi-m4b
- nanopi-r2s
- radxa-zero-3e
- rock-pi-4b
- rock-pi-e
- rock-pi-sRun tested on the following without RAUC:
- radxa-zero-3e
- rock-pi-e
- rock-pi-s[1] oe-core:
3442d9297dca("oe-selftest: fitimage: test external dtb")Signed-off-by Trevor Woerner <[email protected]>Quoted 14 lines
--- conf/machine/include/px30.inc | 3 +-- conf/machine/include/rk3066.inc | 1 + conf/machine/include/rk3188.inc | 1 + conf/machine/include/rk3288.inc | 1 + conf/machine/include/rk3308.inc | 3 +-- conf/machine/include/rk3328.inc | 3 +-- conf/machine/include/rk3399.inc | 3 +-- conf/machine/include/rk3566.inc | 3 +-- conf/machine/include/rk3568.inc | 3 +-- conf/machine/include/rk3588s.inc | 3 +-- conf/machine/include/rockchip-defaults.inc | 2 ++ conf/machine/include/rockchip-extlinux.inc | 8 ++++---- conf/machine/include/rockchip-fitimage.inc | 4 ++++Missing info in the top README about this new variable I believe?
conf/machine/include/px30.inc require conf/machine/include/arm/armv8a/tune-cortexa35.inc · line 13
Quoted 13 lines
13 files changed, 20 insertions(+), 18 deletions(-)create mode 100644 conf/machine/include/rockchip-fitimage.inc
conf/machine/include/px30.inc +1
-2@@ -11,8 +11,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.incquestion: should this be only included when
RK_FITIMAGE= "True"?some sort of
inherit_deferbut for require? Or maybe we should set the variables in rockchip-fitimage only ifRK_FITIMAGE= "True" and leave them as is if False?
Quoted 5 lines
It seems like SoCs with
RK_FITIMAGE= "False" should not inherit rockchip-fitimage.inc and those with True should? What happens if you have a board outside of meta-rockchip with px30 which you don't want to support fitImage by default (that's my case, so I guess I'll need to build this to figure it out :) ).
Yes, exactly. I would have preferred to have it setup such that conf/machine/include/rockchip-fitimage.inc is either:
1) required conditionally
2) would include some sort of if/else logic to only apply fit-related options when RK_FITIMAGE is true
but I couldn't find some mechanism to do that.
I could think about it some more, I haven't looked into inherit_defer.
Quoted 110 lines
Quoted 110 lines
conf/machine/include/px30.inc +0
-0TFA_PLATFORM = "px30" TFA_BUILD_TARGET = "bl31"conf/machine/include/rk3066.inc +1
-0@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"conf/machine/include/rk3188.inc +1
-0@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyFIQ0" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"conf/machine/include/rk3288.inc +1
-0@@ -9,6 +9,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa17.inc SERIAL_CONSOLES = "115200;ttyS2" +RK_FITIMAGE = "False" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage"conf/machine/include/rk3308.inc +1
-2@@ -13,8 +13,7 @@ SERIAL_CONSOLES = "1500000;ttyS0" KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3308 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000"conf/machine/include/rk3328.inc +1
-2@@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31"conf/machine/include/rk3399.inc +1
-2@@ -12,8 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31"conf/machine/include/rk3566.inc +1
-2@@ -11,8 +11,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"conf/machine/include/rk3568.inc +1
-2@@ -11,8 +11,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3568 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"conf/machine/include/rk3588s.inc +1
-2@@ -10,8 +10,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3588s = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" -KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE ?= "fitImage" +require conf/machine/include/rockchip-fitimage.inc PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os"conf/machine/include/rockchip-defaults.inc +0
-0@@ -1,7 +1,9 @@ # meta-rockchip default settings
Quoted 8 lines
conf/machine/include/rockchip-defaults.inc line 6
Quoted 5 lines
conf/machine/include/rockchip-defaults.inc +2
-0MACHINEOVERRIDES =. "${@bb.utils.contains('ROCKCHIP_CLOSED_TPL', '1', 'closed-tpl:', '', d)}" MACHINEOVERRIDES =. "rockchip:" + # kernel +RK_FITIMAGE ?= "True"What about using a more typical 0/1 like we do for other variables?
ENABLE_STATELESS_VPU_GSTorRKBIN_DDR_RECONFIGUREfor example?
lol, the last time i used a 0/1 you said: a boolean would be more appropriate ;-)
Quoted 17 lines
Quoted 8 lines
conf/machine/include/rockchip-defaults.inc +0
-0PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig"conf/machine/include/rockchip-extlinux.inc +0
-0conf/machine/include/rockchip-extlinux.inc NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" · line 16
Quoted 6 lines
conf/machine/include/rockchip-extlinux.inc +2
-2@@ -13,13 +13,13 @@ NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" UBOOT_EXTLINUX ?= "1" UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=rootfsA" -UBOOT_EXTLINUX_FDTDIR ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot', d)}" -UBOOT_EXTLINUX_FDT ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot/${NONFITDT}', d)}" +UBOOT_EXTLINUX_FDTDIR ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot'}" +UBOOT_EXTLINUX_FDT ?= "${@ '' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '/boot/${NONFITDT}'}"I guess you can avoid the ,False part as the default is None, which should fail your if condition. Just a matter of taste though.
If that works, great! I dislike the silly ",False" part.
Quoted 16 lines
conf/machine/include/rockchip-extlinux.inc NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" · line 20
Quoted 4 lines
conf/machine/include/rockchip-extlinux.inc +1
-1UBOOT_EXTLINUX_CONSOLE ?= "earlycon console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8" UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait rw rootfstype=ext4" -UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${KERNEL_IMAGETYPE}" +UBOOT_EXTLINUX_KERNEL_IMAGE ?= "/boot/${@ 'fitImage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else '${KERNEL_IMAGETYPE}'}"Ditto.
Quoted 9 lines
conf/machine/include/rockchip-extlinux.inc +1
-1UBOOT_EXTLINUX_LABELS ?= "default" UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', 'kernel-devicetree', d)}" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${@ 'linux-yocto-fitimage' if bb.utils.to_boolean(d.getVar('RK_FITIMAGE'),False) else 'kernel-devicetree'}"conf/machine/include/rockchip-fitimage.inc new file +0
-1--- /dev/null
Quoted 8 lines
conf/machine/include/rockchip-fitimage.inc line 4
Quoted 6 lines
+++ b/conf/machine/include/rockchip-fitimage.inc
conf/machine/include/rockchip-fitimage.inc new file +4
-0@@ -0,0 +1,4 @@ +KERNEL_CLASSES += "kernel-fit-extra-artifacts" +KERNEL_IMAGETYPE = "Image" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" +KERNEL_DEPLOY_DEPEND = "linux-yocto-fitimage:do_deploy"Should this be a ?= so that we can easily override/change it?
Sounds good, probably the KERNEL_IMAGETYPE too?
Quoted 5 lines
Looks ok to me otherwise, I have px30, rk3399 and rk3588 boards which do not use fit images so I'll try to check this next week. Considering meta-rockchip doesn't build at all anymore, I guess you may want to fix this ASAP your way and I can figure out a way to fix it up "further" for non-fitimages scenario?).
I agree. But i think there are some v2 things i could do now.
Quoted 14 lines
Cheers,
Quentin-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1640): https://lists.yoctoproject.org/g/yocto-patches/message/1640
Mute This Topic: https://lists.yoctoproject.org/mt/113621966/900817
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Trevor,
Quoted 3 lines · Trevor Woerner via lists.yoctoproject.org
The two patches being carried in this layer for tf-a are no longer required and can be dropped.
Better even, they were merged :)
f86c230ab02c ("fix(rk3399): dram: Fix build with gcc 11")
for the first one, part of v2.13 (but maybe will be backported to lts releases?)
7f25d3cc7823 ("fix(rockchip): pmu: Do not mark already defined functions as weak")
for the second one, part of v2.13 (but maybe will be backport to lts releases? watch out for Yocto branches with 2.12 release for example).
Thanks!
Quentin
Quoted 14 lines · Quentin Schulz via lists.yoctoproject.org
Hi Trevor,
Quoted 3 lines · Trevor Woerner via lists.yoctoproject.org
The two patches being carried in this layer for tf-a are no longer required and can be dropped.
Better even, they were merged :)
f86c230ab02c("fix(rk3399): dram: Fix build with gcc 11")for the first one, part of v2.13 (but maybe will be backported to lts releases?)
Quoted 7 lines
7f25d3cc7823("fix(rockchip): pmu: Do not mark already defined functions as weak")for the second one, part of v2.13 (but maybe will be backport to lts releases? watch out for Yocto branches with 2.12 release for example).
Reviewed-by Quentin Schulz <[email protected]>
Awesome thanks! Added to the commit.
Quoted 13 lines
Thanks!
Quentin-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1639): https://lists.yoctoproject.org/g/yocto-patches/message/1639
Mute This Topic: https://lists.yoctoproject.org/mt/113621967/900817
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Trevor Woerner
AppliedQuoted 11 lines · Trevor Woerner
The two patches being carried in this layer for tf-a are no longer required and can be dropped.
Signed-off-by Trevor Woerner <[email protected]>--- .../0001-dram-Fix-build-with-gcc-11.patch | 35 ------------------- ...rk-already-defined-functions-as-weak.patch | 35 ------------------- .../trusted-firmware-a_%.bbappend | 7 ---- 3 files changed, 77 deletions(-) delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch
Applied to meta-rockchip, master branch.