MIRRORS/meta-rockchip
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-rockchip.git synced 2025-07-19 20:59:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch to the new bitbake OVERRIDE syntax

Browse Source 
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.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Trevor Woerner 2021-08-04 11:00:16 -04:00
parent a3ef99b596
commit 335bfcbf8d
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/rockchip-gpt-img.bbclass
View File

@ -37,10 +37,10 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \
virtual/kernel:do_deploy \ virtual/kernel:do_deploy \
virtual/bootloader:do_deploy" virtual/bootloader:do_deploy"
PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" 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:rock2-square = "generate_rock2_loader1_image"
IMAGE_CMD_rockchip-gpt-img () { IMAGE_CMD:rockchip-gpt-img () {
# Change to image directory # Change to image directory
cd ${DEPLOY_DIR_IMAGE} cd ${DEPLOY_DIR_IMAGE}

2
conf/machine/include/rk3288.inc
View File

@ -12,5 +12,5 @@ SERIAL_CONSOLES = "115200;ttyS2"
KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KBUILD_DEFCONFIG ?= "multi_v7_defconfig"
KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE = "zImage"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"
UBOOT_SUFFIX ?= "bin" UBOOT_SUFFIX ?= "bin"

2
conf/machine/include/rk3328.inc
View File

@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31"
UBOOT_SUFFIX ?= "itb" UBOOT_SUFFIX ?= "itb"
UBOOT_ENTRYPOINT ?= "0x06000000" UBOOT_ENTRYPOINT ?= "0x06000000"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"

2
conf/machine/include/rk3399.inc
View File

@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31"
UBOOT_SUFFIX ?= "itb" UBOOT_SUFFIX ?= "itb"
UBOOT_ENTRYPOINT ?= "0x06000000" UBOOT_ENTRYPOINT ?= "0x06000000"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot"

2
conf/machine/include/rockchip-defaults.inc
View File

@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
KCONFIG_MODE ?= "alldefconfig" KCONFIG_MODE ?= "alldefconfig"
# xserver # xserver
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER:virtual/xserver = "xserver-xorg"
XSERVER = " \ XSERVER = " \
xserver-xorg \ xserver-xorg \
xserver-xorg-utils \ xserver-xorg-utils \

2
conf/machine/include/rockchip-wic.inc
View File

@ -23,7 +23,7 @@ RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}"
# boot device (sd-card/emmc) # boot device (sd-card/emmc)
RK_BOOT_DEVICE ??= "mmcblk0" RK_BOOT_DEVICE ??= "mmcblk0"
WICVARS_append = " \ WICVARS:append = " \
RK_BOOT_DEVICE \ RK_BOOT_DEVICE \
RK_CONSOLE_BAUD \ RK_CONSOLE_BAUD \
RK_CONSOLE_DEVICE \ RK_CONSOLE_DEVICE \

4
conf/machine/rock-pi-e.conf
View File

@ -7,9 +7,9 @@ require conf/machine/include/rk3328.inc
MACHINEOVERRIDES =. "rock-pi-e:" 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" KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb"
MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot" PREFERRED_PROVIDER:virtual/bootloader = "u-boot"
UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig" UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig"

10
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
View File

@ -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', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \
'', d), d)}" '', 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:append:rk3399 = " libinput examples tslib xkbcommon"
PACKAGECONFIG_remove_rk3399 = "tests" PACKAGECONFIG:remove:rk3399 = "tests"

8
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
View File

@ -1,11 +1,11 @@
# Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC # Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC
# toolchain # 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:rk3399 = "|rk3399"
COMPATIBLE_MACHINE_append_rk3328 = "|rk3328" COMPATIBLE_MACHINE:append:rk3328 = "|rk3328"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "\ SRC_URI += "\
file://serial-console-baudrate.patch \ file://serial-console-baudrate.patch \
file://0001-Fix-build-with-gcc-11.patch \ file://0001-Fix-build-with-gcc-11.patch \

10
recipes-bsp/u-boot/u-boot%.bbappend
View File

@ -1,4 +1,4 @@
do_compile_append_rock2-square () { do_compile:append:rock2-square () {
# copy to default search path # copy to default search path
if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
cp ${B}/spl/${SPL_BINARY} ${B} cp ${B}/spl/${SPL_BINARY} ${B}
@ -7,10 +7,10 @@ do_compile_append_rock2-square () {
ATF_DEPENDS ??= "" ATF_DEPENDS ??= ""
EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy" ATF_DEPENDS:rk3399 = " virtual/trusted-firmware-a:do_deploy"
EXTRA_OEMAKE_append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
ATF_DEPENDS_rk3328 = " virtual/trusted-firmware-a:do_deploy" ATF_DEPENDS:rk3328 = " virtual/trusted-firmware-a:do_deploy"
do_compile[depends] .= "${ATF_DEPENDS}" do_compile[depends] .= "${ATF_DEPENDS}"

4
recipes-graphics/mesa/mesa_%.bbappend
View File

@ -1,2 +1,2 @@
PACKAGECONFIG_append_rk3288 = " kmsro panfrost" PACKAGECONFIG:append:rk3288 = " kmsro panfrost"
PACKAGECONFIG_append_rk3399 = " kmsro panfrost" PACKAGECONFIG:append:rk3399 = " kmsro panfrost"

28
recipes-kernel/linux/linux-yocto%.bbappend
View File

@ -1,17 +1,17 @@
COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" COMPATIBLE_MACHINE:marsboard-rk3066 = "marsboard-rk3066"
COMPATIBLE_MACHINE_rock2-square = "rock2-square" COMPATIBLE_MACHINE:rock2-square = "rock2-square"
COMPATIBLE_MACHINE_radxarock = "radxarock" COMPATIBLE_MACHINE:radxarock = "radxarock"
COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288"
COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288"
COMPATIBLE_MACHINE_tinker-board = "tinker-board" COMPATIBLE_MACHINE:tinker-board = "tinker-board"
COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s"
COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4"
COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4" COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4"
COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb" COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb"
COMPATIBLE_MACHINE_rock64 = "rock64" COMPATIBLE_MACHINE:rock64 = "rock64"
COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
# indeed applicable to all rk3328 boards # 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"

4
recipes-kernel/linux/linux-yocto_5.4.bbappend
View File

@ -1,5 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
# tinker-board and tinker-board-s. rk3288 covers both # 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"