layer.conf: update layer compatibility for honister
PATCH 1/2 layer.conf: update layer compatibility for honister
Add honister, remove hardknott.
--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
@@ -14,7 +14,7 @@ BBFILE_PRIORITY_rockchip = "1" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_rockchip = "1" -LAYERSERIES_COMPAT_rockchip = "hardknott" +LAYERSERIES_COMPAT_rockchip = "honister" LAYERDEPENDS_rockchip = "core meta-arm" BBFILES_DYNAMIC += " \
Signature · 1 line
2.30.0.rc0
PATCH 2/2 switch to the new bitbake OVERRIDE syntax
With bitbake commit 7dcf317cc141dc980634f8c18bfa84f83e57206a ("bitbake: Switch to using new override syntax"), applied on Aug 2, 2021, the OVERRIDE separator is now a colon instead of an underscore. Therefore all builds performed with a bitbake before this change must use a meta-rockchip commit before this one, and any builds performed with a bitbake after this change must use a meta-rockchip starting from this commit onwards.
Build-tested for all meta-rockchip MACHINEs.
Run tested on:
- tinker-board
- nanopi-m4-2gb
- rock64
- rock-pi-4b
- rock-pi-e
The tinker-board and rock-pi-e work fine. The rest of the boards seem to have a, hopefully unrelated, issue running a 5.13-yocto-standard kernel. However, all boards work with the 5.10-yocto-standard kernel.
--- classes/rockchip-gpt-img.bbclass | 6 ++-- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- conf/machine/include/rockchip-defaults.inc | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- conf/machine/rock-pi-e.conf | 4 +-- .../recipes-qt/qt5/qtbase_%.bbappend | 10 +++---- .../trusted-firmware-a_%.bbappend | 8 +++--- recipes-bsp/u-boot/u-boot%.bbappend | 10 +++---- recipes-graphics/mesa/mesa_%.bbappend | 4 +-- recipes-kernel/linux/linux-yocto%.bbappend | 28 +++++++++---------- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 +-- 13 files changed, 42 insertions(+), 42 deletions(-)
classes/rockchip-gpt-img.bbclass +3 -3
@@ -37,10 +37,10 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \ virtual/kernel:do_deploy \ virtual/bootloader:do_deploy" -PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" -PER_CHIP_IMG_GENERATION_COMMAND_rock2-square = "generate_rock2_loader1_image" +PER_CHIP_IMG_GENERATION_COMMAND:rk3288 = "generate_rk3288_loader1_image" +PER_CHIP_IMG_GENERATION_COMMAND:rock2-square = "generate_rock2_loader1_image" -IMAGE_CMD_rockchip-gpt-img () { +IMAGE_CMD:rockchip-gpt-img () { # Change to image directory cd ${DEPLOY_DIR_IMAGE}
conf/machine/include/rk3288.inc +1 -1
@@ -12,5 +12,5 @@ SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot" UBOOT_SUFFIX ?= "bin"
conf/machine/include/rk3328.inc +1 -1
@@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
conf/machine/include/rk3399.inc +1 -1
@@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
conf/machine/include/rockchip-defaults.inc +1 -1
@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig" # xserver -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_PROVIDER:virtual/xserver = "xserver-xorg" XSERVER = " \ xserver-xorg \ xserver-xorg-utils \
conf/machine/include/rockchip-wic.inc +1 -1
@@ -23,7 +23,7 @@ RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" # boot device (sd-card/emmc) RK_BOOT_DEVICE ??= "mmcblk0" -WICVARS_append = " \ +WICVARS:append = " \ RK_BOOT_DEVICE \ RK_CONSOLE_BAUD \ RK_CONSOLE_DEVICE \
conf/machine/rock-pi-e.conf +2 -2
@@ -7,9 +7,9 @@ require conf/machine/include/rk3328.inc MACHINEOVERRIDES =. "rock-pi-e:" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" +PREFERRED_PROVIDER:virtual/kernel = "linux-yocto-dev" KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_PROVIDER:virtual/bootloader = "u-boot" UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig"
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +5 -5
@@ -1,9 +1,9 @@ -PACKAGECONFIG_GL_rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ +PACKAGECONFIG_GL:rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rk3399 = " kms gbm" +PACKAGECONFIG_GL:append:rk3399 = " kms gbm" -PACKAGECONFIG_FONTS_rk3399 = "fontconfig" +PACKAGECONFIG_FONTS:rk3399 = "fontconfig" -PACKAGECONFIG_append_rk3399 = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove_rk3399 = "tests" +PACKAGECONFIG:append:rk3399 = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove:rk3399 = "tests"
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +4 -4
@@ -1,11 +1,11 @@ # Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC # toolchain -DEPENDS_append_rk3399 = " virtual/arm-none-eabi-gcc-native" +DEPENDS:append:rk3399 = " virtual/arm-none-eabi-gcc-native" -COMPATIBLE_MACHINE_append_rk3399 = "|rk3399" -COMPATIBLE_MACHINE_append_rk3328 = "|rk3328" +COMPATIBLE_MACHINE:append:rk3399 = "|rk3399" +COMPATIBLE_MACHINE:append:rk3328 = "|rk3328" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ file://serial-console-baudrate.patch \ file://0001-Fix-build-with-gcc-11.patch \
recipes-bsp/u-boot/u-boot%.bbappend +5 -5
@@ -1,4 +1,4 @@ -do_compile_append_rock2-square () { +do_compile:append:rock2-square () { # copy to default search path if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then cp ${B}/spl/${SPL_BINARY} ${B}
@@ -7,10 +7,10 @@ do_compile_append_rock2-square () { ATF_DEPENDS ??= "" -EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy" -EXTRA_OEMAKE_append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -ATF_DEPENDS_rk3328 = " virtual/trusted-firmware-a:do_deploy" +EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" +ATF_DEPENDS:rk3399 = " virtual/trusted-firmware-a:do_deploy" +EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" +ATF_DEPENDS:rk3328 = " virtual/trusted-firmware-a:do_deploy" do_compile[depends] .= "${ATF_DEPENDS}"
recipes-graphics/mesa/mesa_%.bbappend +2 -2
@@ -1,2 +1,2 @@ -PACKAGECONFIG_append_rk3288 = " kmsro panfrost" -PACKAGECONFIG_append_rk3399 = " kmsro panfrost" +PACKAGECONFIG:append:rk3288 = " kmsro panfrost" +PACKAGECONFIG:append:rk3399 = " kmsro panfrost"
recipes-kernel/linux/linux-yocto%.bbappend +14 -14
@@ -1,17 +1,17 @@ -COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" -COMPATIBLE_MACHINE_rock2-square = "rock2-square" -COMPATIBLE_MACHINE_radxarock = "radxarock" -COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" -COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" -COMPATIBLE_MACHINE_tinker-board = "tinker-board" -COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" -COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" -COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4" -COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb" -COMPATIBLE_MACHINE_rock64 = "rock64" -COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" +COMPATIBLE_MACHINE:marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE:rock2-square = "rock2-square" +COMPATIBLE_MACHINE:radxarock = "radxarock" +COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288" +COMPATIBLE_MACHINE:tinker-board = "tinker-board" +COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4" +COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4" +COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb" +COMPATIBLE_MACHINE:rock64 = "rock64" +COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # indeed applicable to all rk3328 boards -SRC_URI_append_rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch" +SRC_URI:append:rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch"
recipes-kernel/linux/linux-yocto_5.4.bbappend +2 -2
@@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # tinker-board and tinker-board-s. rk3288 covers both -SRC_URI_append_rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch" +SRC_URI:append:rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch"
Signature · 1 line
2.30.0.rc0
Trevor Woerner
AppliedRe: [meta-rockchip][PATCH 2/2] switch to the new bitbake OVERRIDE syntax
Quoted 24 lines · Trevor Woerner
With bitbake commit
7dcf317cc141dc980634f8c18bfa84f83e57206a("bitbake: Switch to using new override syntax"), applied on Aug 2, 2021, the OVERRIDE separator is now a colon instead of an underscore. Therefore all builds performed with a bitbake before this change must use a meta-rockchip commit before this one, and any builds performed with a bitbake after this change must use a meta-rockchip starting from this commit onwards.Build-tested for all meta-rockchip MACHINEs.
Run tested on:
- tinker-board
- nanopi-m4-2gb
- rock64
- rock-pi-4b
- rock-pi-eThe tinker-board and rock-pi-e work fine. The rest of the boards seem to have a, hopefully unrelated, issue running a 5.13-yocto-standard kernel. However, all boards work with the 5.10-yocto-standard kernel.
Signed-off-by Trevor Woerner <[email protected]>Signed-off-by Khem Raj <[email protected]>
Quoted 16 lines
--- classes/rockchip-gpt-img.bbclass | 6 ++-- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- conf/machine/include/rockchip-defaults.inc | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- conf/machine/rock-pi-e.conf | 4 +-- .../recipes-qt/qt5/qtbase_%.bbappend | 10 +++---- .../trusted-firmware-a_%.bbappend | 8 +++--- recipes-bsp/u-boot/u-boot%.bbappend | 10 +++---- recipes-graphics/mesa/mesa_%.bbappend | 4 +-- recipes-kernel/linux/linux-yocto%.bbappend | 28 +++++++++---------- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 +-- 13 files changed, 42 insertions(+), 42 deletions(-)
applied to meta-rockchip, master
Trevor Woerner
AppliedQuoted 8 lines · Trevor Woerner
Add honister, remove hardknott.
Signed-off-by Trevor Woerner <[email protected]>Signed-off-by Khem Raj <[email protected]>--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
applied to meta-rockchip, master