diff options
78 files changed, 1149 insertions, 273 deletions
@@ -18,20 +18,60 @@ Dependencies: Status of supported boards: -------------------------- builds and boots wic image: - rock-pi-4 + nanopi-m4 + nanopi-m4-2gb + rock-pi-e + rock-pi-4a + rock-pi-4b + rock-pi-4c + rock64 tinker-board tinker-board-s vyasa-rk3288 firefly-rk3288 + nanopi-r4s + rock-5b + nanopi-r2s + nanopi-m4b + rock-pi-s + rock-5a + roc-rk3328-cc + roc-rk3308-cc + orangepi-5-plus + rock-3a + rock-4c-plus builds: marsboard-rk3066 radxarock rock2-square +Notes: +----- + The latest ddr initializer for the rk3308 platform does not output + diagnostic messages to uart0. This causes a bunch of gibberish to + be printed to the console window which only becomes legible once + the linux kernel starts. I.e. the console output of the ddr + initialization routine, as well as u-boot is lost. An older + version of this same binary blob does, however, support output to + uart0 (making its diagnostic messages as well as u-boot available + on the console). By default the build assumes the user would like + to see these message and be able to have the option to interact + with u-boot. + + IOW: for rk3308-based devices, an older version of rkbin is used. + + If, however, the user would prefer to use the latest binary ddr + initializer from rkbin, simply set: + + RKBIN_RK3308_LATEST = "1" + + in the configuration (e.g. conf/local.conf). + Maintenance: ----------- Please send pull requests, patches, comments, or questions to the - yocto mailing list (yocto@yoctoproject.org) CCing the maintainer + yocto-patches mailing list (yocto-patches@lists.yoctoproject.org) + CCing the maintainer When sending patches, please make sure the email subject line includes "[meta-rockchip][PATCH]" and follow the community's patch submission @@ -39,10 +79,17 @@ Maintenance: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded - For example, to send your most recent commit (i.e. just one patch), + This can be configured within the repository with the following commands: + + git config sendemail.to yocto-patches@lists.yoctoproject.org + git config sendemail.cc <your full email address> + git config format.subjectprefix "meta-rockchip] [PATCH" + + Then, to send your most recent commit (i.e. just one patch), please use something like: - git format-patch -M --subject-prefix="meta-rockchip][PATCH" HEAD^ - git send-email --to yocto@yoctoproject.org --cc twoerner@gmail.com <your patch file> + + git format-patch -M -1 + git send-email <your patch file> Maintainer: ---------- diff --git a/classes/rockchip-gpt-img.bbclass b/classes/rockchip-gpt-img.bbclass index 3ee46c8..440dcac 100644 --- a/classes/rockchip-gpt-img.bbclass +++ b/classes/rockchip-gpt-img.bbclass @@ -9,7 +9,7 @@ IMG_ROOTFS_TYPE = "ext4" IMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMG_ROOTFS_TYPE}" # This image depends on the rootfs image -IMAGE_TYPEDEP_rockchip-gpt-img = "${IMG_ROOTFS_TYPE}" +IMAGE_TYPEDEP:rockchip-gpt-img = "${IMG_ROOTFS_TYPE}" GPTIMG = "${IMAGE_NAME}-gpt.img" GPTIMG_SYMLK = "${IMAGE_BASENAME}-${MACHINE}-gpt.img" @@ -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} @@ -108,7 +108,7 @@ create_rk_image () { mcopy -i ${WORKDIR}/${BOOT_IMG} -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::${KERNEL_IMAGETYPE} DEVICETREE_DEFAULT="" - for DTS_FILE in ${KERNEL_DEVICETREE}; do + for DTS_FILE in $(echo ${KERNEL_DEVICETREE} | cut -d'/' -f2); do [ -n "${DEVICETREE_DEFAULT}"] && DEVICETREE_DEFAULT="${DTS_FILE}" mcopy -i ${WORKDIR}/${BOOT_IMG} -s ${DEPLOY_DIR_IMAGE}/${DTS_FILE} ::${DTS_FILE} done diff --git a/conf/layer.conf b/conf/layer.conf index 4168391..68205dd 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,5 +14,10 @@ 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 = "dunfell" +LAYERSERIES_COMPAT_rockchip = "scarthgap" LAYERDEPENDS_rockchip = "core meta-arm" + +BBFILES_DYNAMIC += " \ + qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \ + qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ +" diff --git a/conf/machine/firefly-rk3288.conf b/conf/machine/firefly-rk3288.conf index 2a5f0ba..6ff1be8 100644 --- a/conf/machine/firefly-rk3288.conf +++ b/conf/machine/firefly-rk3288.conf @@ -7,20 +7,7 @@ #http://www.t-firefly.com/en/ require conf/machine/include/rk3288.inc +require conf/machine/include/rockchip-wic.inc -KERNEL_DEVICETREE = "rk3288-firefly.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-firefly.dtb" UBOOT_MACHINE = "firefly-rk3288_defconfig" - -WKS_FILE ?= "firefly-rk3288.wks" -IMAGE_FSTYPES += "wic wic.bmap" - -WKS_FILE_DEPENDS ?= " \ - mtools-native \ - dosfstools-native \ - virtual/bootloader \ - virtual/kernel \ - " -IMAGE_BOOT_FILES ?= "\ - ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ - " diff --git a/conf/machine/include/nanopi-m4.inc b/conf/machine/include/nanopi-m4.inc new file mode 100644 index 0000000..aaf07a3 --- /dev/null +++ b/conf/machine/include/nanopi-m4.inc @@ -0,0 +1,11 @@ +# Copyright (C) 2021 Blade SAS +# Common definitions for all NanoPi M4 RK3399 board variants + +# add a common override for all nanopi-m4 +MACHINEOVERRIDES =. "nanopi-m4:" + +require conf/machine/include/rk3399.inc + +MACHINE_FEATURES += "usbhost serial" + +KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4.dtb" diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc new file mode 100644 index 0000000..badcbcd --- /dev/null +++ b/conf/machine/include/px30.inc @@ -0,0 +1,21 @@ +# Copyright (C) 2022 Theobroma Systems Design und Consulting +# Released under the MIT license (see COPYING.MIT for the terms) + +SOC_FAMILY = "px30" + +DEFAULTTUNE ?= "cortexa35-crypto" + +require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv8a/tune-cortexa35.inc +require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/rockchip-wic.inc + +KBUILD_DEFCONFIG ?= "defconfig" +KERNEL_CLASSES = "kernel-fitimage" +KERNEL_IMAGETYPE ?= "fitImage" + +TFA_PLATFORM = "px30" +TFA_BUILD_TARGET = "bl31" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc index dffbee0..3510df2 100644 --- a/conf/machine/include/rk3066.inc +++ b/conf/machine/include/rk3066.inc @@ -3,9 +3,12 @@ SOC_FAMILY = "rk3066" -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc +SERIAL_CONSOLES = "115200;ttyS2" + KBUILD_DEFCONFIG = "multi_v7_defconfig" -KERNEL_IMAGETYPE = "zImage" +KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" +KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc index 59e65d1..830f908 100644 --- a/conf/machine/include/rk3188.inc +++ b/conf/machine/include/rk3188.inc @@ -3,9 +3,12 @@ SOC_FAMILY = "rk3188" -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc +SERIAL_CONSOLES = "115200;ttyFIQ0" + KBUILD_DEFCONFIG = "multi_v7_defconfig" -KERNEL_IMAGETYPE = "zImage" +KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" +KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index 480e250..e682c0b 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -3,15 +3,14 @@ SOC_FAMILY = "rk3288" -require conf/machine/include/tune-cortexa17.inc +require conf/machine/include/arm/armv7a/tune-cortexa17.inc require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc -KBUILD_DEFCONFIG ?= "multi_v7_defconfig" -KERNEL_IMAGETYPE = "zImage" - SERIAL_CONSOLES = "115200;ttyS2" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" -SPL_BINARY ?= "idbloader.img" +KBUILD_DEFCONFIG ?= "multi_v7_defconfig" +KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" +KERNEL_IMAGETYPE ?= "zImage" +UBOOT_SUFFIX ?= "bin" diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc new file mode 100644 index 0000000..5a5dafd --- /dev/null +++ b/conf/machine/include/rk3308.inc @@ -0,0 +1,18 @@ +SOC_FAMILY = "rk3308" + +DEFAULTTUNE ?= "cortexa35-crypto" + +require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv8a/tune-cortexa35.inc +require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/rockchip-wic.inc + +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" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc new file mode 100644 index 0000000..6be777c --- /dev/null +++ b/conf/machine/include/rk3328.inc @@ -0,0 +1,22 @@ +# Copyright (C) 2021 Blade SAS +# Released under the MIT license (see COPYING.MIT for the terms) + +SOC_FAMILY = "rk3328" + +DEFAULTTUNE ?= "cortexa53-crypto" + +require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc +require conf/machine/include/rockchip-defaults.inc +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" + +TFA_PLATFORM = "rk3328" +TFA_BUILD_TARGET = "bl31" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 4019988..5a3f439 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -5,22 +5,18 @@ SOC_FAMILY = "rk3399" DEFAULTTUNE ?= "cortexa72-cortexa53-crypto" -require conf/machine/include/tune-cortexa72-cortexa53.inc require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/rockchip-defaults.inc +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" +KERNEL_IMAGETYPE ?= "fitImage" TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" - -SERIAL_CONSOLES = "115200;ttyS2" - -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" -SPL_BINARY ?= "idbloader.img" - diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc new file mode 100644 index 0000000..3c227dc --- /dev/null +++ b/conf/machine/include/rk3568.inc @@ -0,0 +1,19 @@ +SOC_FAMILY = "rk3568" + +DEFAULTTUNE ?= "cortexa55" + +require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc +require conf/machine/include/rockchip-defaults.inc +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" + +PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin" +PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/include/rk3588.inc b/conf/machine/include/rk3588.inc new file mode 100644 index 0000000..34f0627 --- /dev/null +++ b/conf/machine/include/rk3588.inc @@ -0,0 +1,6 @@ +MACHINEOVERRIDES =. "rk3588:" + +# the rk3588s is a "stripped-down" version of the rk3588 +# in the kernel's device-tree the rk3588 builds on top of the rk3588s +# so anything that is valid for the rk3588s is valid for the rk3588 +require conf/machine/include/rk3588s.inc diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc new file mode 100644 index 0000000..878f7a8 --- /dev/null +++ b/conf/machine/include/rk3588s.inc @@ -0,0 +1,17 @@ +MACHINEOVERRIDES =. "rk3588s:" +DEFAULTTUNE ?= "cortexa76-cortexa55-crypto" + +require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc +require conf/machine/include/rockchip-defaults.inc +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" + +PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin" +PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/include/rock-pi-4.inc b/conf/machine/include/rock-pi-4.inc new file mode 100644 index 0000000..0a86846 --- /dev/null +++ b/conf/machine/include/rock-pi-4.inc @@ -0,0 +1,6 @@ +# Add a common override for all Rock Pi 4 machines +MACHINEOVERRIDES =. "rock-pi-4:" + +require conf/machine/include/rk3399.inc + +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index a4e2a2c..2387eb9 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -3,10 +3,8 @@ # kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig" -LINUX_VERSION_EXTENSION ?= "-rockchip" # xserver -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = " \ xserver-xorg \ xserver-xorg-utils \ @@ -17,13 +15,9 @@ XSERVER = " \ xf86-video-modesetting \ xf86-input-evdev \ xf86-input-mouse \ - xf86-input-keyboard \ " # misc -IMAGE_FSTYPES += "ext4" - -# boot device (sd-card/emmc) -RK_BOOT_DEVICE ??= "mmcblk0" -WICVARS_append = " RK_BOOT_DEVICE" - +SERIAL_CONSOLES ?= "1500000;ttyS2" +RK_CONSOLE_BAUD ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[0]}" +RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc new file mode 100644 index 0000000..ca33f4c --- /dev/null +++ b/conf/machine/include/rockchip-extlinux.inc @@ -0,0 +1,24 @@ +# KERNEL_DEVICETREE follows the pattern of +# 'rockchip/${SOC_FAMILY}-${BOARD}.dtb' which is required when compiling +# the kernel so the kernel's Makefile can find the device tree +# +# when using extlinux with a fitImage the device tree is contained in the +# fitImage +# +# however for non-fitImages it is not found at +# $UBOOT_EXTLINUX_FDTDIR/rockchip/$KERNEL_DEVICETREE but rather at +# $UBOOT_EXTLINUX_FDTDIR/$KERNEL_DEVICETREE therefore we need to strip off +# the 'rockchip/' part for extlinux non-fitImage builds +NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}" + +UBOOT_EXTLINUX ?= "1" +UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=root" +UBOOT_EXTLINUX_FDTDIR ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '/boot', d)}" +UBOOT_EXTLINUX_FDT ?= "${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${NONFITDT}', d)}" +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_LABELS ?= "default" +UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux" diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc new file mode 100644 index 0000000..147a366 --- /dev/null +++ b/conf/machine/include/rockchip-wic.inc @@ -0,0 +1,17 @@ +# common meta-rockchip wic/wks items + +require conf/machine/include/rockchip-extlinux.inc + +SPL_BINARY ?= "idbloader.img" + +IMAGE_FSTYPES += "wic wic.bmap" +WKS_FILE ?= "rockchip.wks" +WKS_FILE_DEPENDS ?= " \ + e2fsprogs-native \ + virtual/bootloader \ + " + +WICVARS:append = " \ + SPL_BINARY \ + UBOOT_SUFFIX \ + " diff --git a/conf/machine/include/tinker.inc b/conf/machine/include/tinker.inc new file mode 100644 index 0000000..2d05bef --- /dev/null +++ b/conf/machine/include/tinker.inc @@ -0,0 +1,2 @@ +require conf/machine/include/rk3288.inc +require conf/machine/include/rockchip-wic.inc diff --git a/conf/machine/marsboard-rk3066.conf b/conf/machine/marsboard-rk3066.conf index 09414bc..36945e8 100644 --- a/conf/machine/marsboard-rk3066.conf +++ b/conf/machine/marsboard-rk3066.conf @@ -8,5 +8,4 @@ require conf/machine/include/rk3066.inc -SERIAL_CONSOLES = "115200;ttyS2" -KERNEL_DEVICETREE = "rk3066a-marsboard.dtb" +KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb" diff --git a/conf/machine/nanopi-m4-2gb.conf b/conf/machine/nanopi-m4-2gb.conf new file mode 100644 index 0000000..9fd7279 --- /dev/null +++ b/conf/machine/nanopi-m4-2gb.conf @@ -0,0 +1,8 @@ +# Copyright (C) 2021 Blade SAS + +#@TYPE: Machine +#@NAME: NanoPi M4 +#@DESCRIPTION: NanoPi M4 RK3399 board from FriendlyElec, 2GB variant + +require include/nanopi-m4.inc +UBOOT_MACHINE = "nanopi-m4-2gb-rk3399_defconfig" diff --git a/conf/machine/nanopi-m4.conf b/conf/machine/nanopi-m4.conf new file mode 100644 index 0000000..648fc75 --- /dev/null +++ b/conf/machine/nanopi-m4.conf @@ -0,0 +1,8 @@ +# Copyright (C) 2021 Blade SAS + +#@TYPE: Machine +#@NAME: NanoPi M4 +#@DESCRIPTION: NanoPi M4 RK3399 board from FriendlyElec, 4GB variant + +require include/nanopi-m4.inc +UBOOT_MACHINE = "nanopi-m4-rk3399_defconfig" diff --git a/conf/machine/nanopi-m4b.conf b/conf/machine/nanopi-m4b.conf new file mode 100644 index 0000000..35cd8f6 --- /dev/null +++ b/conf/machine/nanopi-m4b.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: NanoPi M4B +#@DESCRIPTION: NanoPi M4B RK3399-based board which has the same form factor as the RPi B3+. +#https://www.friendlyelec.com/index.php?route=product/product&product_id=275 + +require conf/machine/include/rk3399.inc + +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4b.dtb" +UBOOT_MACHINE = "nanopi-m4b-rk3399_defconfig" diff --git a/conf/machine/nanopi-r2s.conf b/conf/machine/nanopi-r2s.conf new file mode 100644 index 0000000..4472c21 --- /dev/null +++ b/conf/machine/nanopi-r2s.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: NanoPi R2S +#@DESCRIPTION: The NanoPi R2S is a mini router with edge computing and dual GbE ports by FriendlyElec +#https://www.friendlyelec.com/index.php?route=product/product&product_id=282 + +require conf/machine/include/rk3328.inc + +KERNEL_DEVICETREE = "rockchip/rk3328-nanopi-r2s.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "nanopi-r2s-rk3328_defconfig" diff --git a/conf/machine/nanopi-r4s.conf b/conf/machine/nanopi-r4s.conf new file mode 100644 index 0000000..21be440 --- /dev/null +++ b/conf/machine/nanopi-r4s.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: NanoPi R4S +#@DESCRIPTION: NanoPi R4S is a high-end FriendlyElec mini-router based on the RK3399 SoC +#https://www.friendlyelec.com/index.php?route=product/product&product_id=284 + +require conf/machine/include/rk3399.inc + +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-r4s.dtb" +UBOOT_MACHINE = "nanopi-r4s-rk3399_defconfig" diff --git a/conf/machine/orangepi-5-plus.conf b/conf/machine/orangepi-5-plus.conf new file mode 100644 index 0000000..2731ff4 --- /dev/null +++ b/conf/machine/orangepi-5-plus.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: Orange Pi 5 Plus +#@DESCRIPTION: 5th generation SBC designed by Kunlong Co.,Limited. +#http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5-plus-32GB.html + +require conf/machine/include/rk3588.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" +KERNEL_DEVICETREE = "rockchip/rk3588-orangepi-5-plus.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "orangepi-5-plus-rk3588_defconfig" diff --git a/conf/machine/radxarock.conf b/conf/machine/radxarock.conf index 2036f6a..6ad8474 100644 --- a/conf/machine/radxarock.conf +++ b/conf/machine/radxarock.conf @@ -9,5 +9,4 @@ require conf/machine/include/rk3188.inc -SERIAL_CONSOLES = "115200;ttyFIQ0" -KERNEL_DEVICETREE = "rk3188-radxarock.dtb" +KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb" diff --git a/conf/machine/roc-rk3308-cc.conf b/conf/machine/roc-rk3308-cc.conf new file mode 100644 index 0000000..839e73c --- /dev/null +++ b/conf/machine/roc-rk3308-cc.conf @@ -0,0 +1,12 @@ +# Copyright (C) 2024 Trevor Woerner +# Released under the MIT license (see COPYING.MIT for the terms) + +#@TYPE: Machine +#@NAME: roc-rk3308-cc +#@DESCRIPTION: T-Firefly ROC-RK3308-CC SBC +#https://en.t-firefly.com/product/rocrk3308cc + +require include/rk3308.inc + +UBOOT_MACHINE = "roc-cc-rk3308_defconfig" +KERNEL_DEVICETREE = "rockchip/rk3308-roc-cc.dtb" diff --git a/conf/machine/roc-rk3328-cc.conf b/conf/machine/roc-rk3328-cc.conf new file mode 100644 index 0000000..05216ec --- /dev/null +++ b/conf/machine/roc-rk3328-cc.conf @@ -0,0 +1,11 @@ +# Copyright (C) 2021 Trevor Woerner +# Released under the MIT license (see COPYING.MIT for the terms) + +#@TYPE: Machine +#@NAME: roc-rk3328-cc (aka "renegade") +#@DESCRIPTION: Libre Computer Board ROC-RK3328-CC (Renegade) Mini Computer with Gigabit Ethernet and USB 3.0 + +require include/rk3328.inc + +UBOOT_MACHINE = "roc-cc-rk3328_defconfig" +KERNEL_DEVICETREE = "rockchip/rk3328-roc-cc.dtb" diff --git a/conf/machine/rock-3a.conf b/conf/machine/rock-3a.conf new file mode 100644 index 0000000..ec3d914 --- /dev/null +++ b/conf/machine/rock-3a.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Radxa Rock 3a +#@DESCRIPTION: ROCK3 is a series of Rockchip RK3566/RK3568 based SBC(Single Board Computer) and Compute Module by Radxa. +#https://wiki.radxa.com/Rock3/3a + +require conf/machine/include/rk3568.inc + +KERNEL_DEVICETREE = "rockchip/rk3568-rock-3a.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "rock-3a-rk3568_defconfig" diff --git a/conf/machine/rock-4c-plus.conf b/conf/machine/rock-4c-plus.conf new file mode 100644 index 0000000..fec4167 --- /dev/null +++ b/conf/machine/rock-4c-plus.conf @@ -0,0 +1,10 @@ +#@TYPE: Machine +#@NAME: ROCK 4C Plus +#@DESCRIPTION: ROCK 4C Plus based on Rockchip RK3399-T Processor is designed by Radxa. +#https://wiki.radxa.com/Rock4/4cplus +#https://docs.radxa.com/en/rock4/rock4c+ + +require conf/machine/include/rock-pi-4.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-4c-plus.dtb" +UBOOT_MACHINE = "rock-4c-plus-rk3399_defconfig" diff --git a/conf/machine/rock-5a.conf b/conf/machine/rock-5a.conf new file mode 100644 index 0000000..1a6aa36 --- /dev/null +++ b/conf/machine/rock-5a.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Radxa Rock 5A +#@DESCRIPTION: ROCK5 is the 5th generation of SBC designed by Radxa. +#https://docs.radxa.com/en/rock5/rock5a + +require conf/machine/include/rk3588s.inc + +KERNEL_DEVICETREE = "rockchip/rk3588s-rock-5a.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "rock5a-rk3588s_defconfig" diff --git a/conf/machine/rock-5b.conf b/conf/machine/rock-5b.conf new file mode 100644 index 0000000..c3a9b0a --- /dev/null +++ b/conf/machine/rock-5b.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Radxa Rock 5B +#@DESCRIPTION: ROCK5 is the 5th generation of SBC designed by Radxa. +#https://wiki.radxa.com/Rock5/5b + +require conf/machine/include/rk3588.inc + +KERNEL_DEVICETREE = "rockchip/rk3588-rock-5b.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "rock5b-rk3588_defconfig" diff --git a/conf/machine/rock-pi-4.conf b/conf/machine/rock-pi-4.conf deleted file mode 100644 index 5231abf..0000000 --- a/conf/machine/rock-pi-4.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2020 Garmin Ltd. or its subsidaries -# Released under the MIT license (see COPYING.MIT for the terms) - -#@TYPE: Machine -#@NAME: Rock Pi 4 RK3399 -#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. - -require conf/machine/include/rk3399.inc - -KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4.dtb" -UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig" - -RK_BOOT_DEVICE = "mmcblk1" -WKS_FILE ?= "rock-pi-4.wks" -IMAGE_FSTYPES += "wic wic.bmap" - -WKS_FILE_DEPENDS ?= " \ - mtools-native \ - dosfstools-native \ - virtual/bootloader \ - virtual/kernel \ - " -IMAGE_BOOT_FILES ?= "\ - ${KERNEL_IMAGETYPE} \ - " - -SERIAL_CONSOLES = "1500000;ttyS2" - -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" diff --git a/conf/machine/rock-pi-4a.conf b/conf/machine/rock-pi-4a.conf new file mode 100644 index 0000000..abe2336 --- /dev/null +++ b/conf/machine/rock-pi-4a.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Rock Pi 4A RK3399 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. +# +# NOTE: This machine is for Kernel 5.10 and later. If you are using an older +# kernel, see rock-pi-4.conf + +require conf/machine/include/rock-pi-4.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4a.dtb" +UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig" diff --git a/conf/machine/rock-pi-4b.conf b/conf/machine/rock-pi-4b.conf new file mode 100644 index 0000000..587fb32 --- /dev/null +++ b/conf/machine/rock-pi-4b.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Rock Pi 4B RK3399 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. +# +# NOTE: This machine is for Kernel 5.10 and later. If you are using an older +# kernel, see rock-pi-4.conf + +require conf/machine/include/rock-pi-4.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4b.dtb" +UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig" diff --git a/conf/machine/rock-pi-4c.conf b/conf/machine/rock-pi-4c.conf new file mode 100644 index 0000000..3af26ff --- /dev/null +++ b/conf/machine/rock-pi-4c.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Rock Pi 4C RK3399 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. +# +# NOTE: This machine is for Kernel 5.10 and later. If you are using an older +# kernel, see rock-pi-4.conf + +require conf/machine/include/rock-pi-4.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4c.dtb" +UBOOT_MACHINE = "rock-pi-4c-rk3399_defconfig" diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf new file mode 100644 index 0000000..517956c --- /dev/null +++ b/conf/machine/rock-pi-e.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: ROCK Pi E rk3328 +#@DESCRIPTION: ROCK Pi E is a Rockchip RK3328-based SBC by Radxa. E is for Ethernets. +#https://wiki.radxa.com/RockpiE + +require conf/machine/include/rk3328.inc + +KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig" diff --git a/conf/machine/rock-pi-s.conf b/conf/machine/rock-pi-s.conf new file mode 100644 index 0000000..79ea73c --- /dev/null +++ b/conf/machine/rock-pi-s.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Radxa Rock Pi S +#@DESCRIPTION: ROCK Pi S is a Rockchip RK3308 based SBC by Radxa. "S" stands for "small square" +#https://wiki.radxa.com/RockpiS + +require conf/machine/include/rk3308.inc + +KERNEL_DEVICETREE = "rockchip/rk3308-rock-pi-s.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "rock-pi-s-rk3308_defconfig" diff --git a/conf/machine/rock2-square.conf b/conf/machine/rock2-square.conf index 46064ee..9468b9a 100644 --- a/conf/machine/rock2-square.conf +++ b/conf/machine/rock2-square.conf @@ -9,7 +9,7 @@ require conf/machine/include/rk3288.inc SPL_BINARY = "u-boot-spl-dtb.bin" -KERNEL_DEVICETREE = "rk3288-rock2-square.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-rock2-square.dtb" UBOOT_MACHINE = "rock2_defconfig" # This board doesn't support the combined idbloader, so resort to the older diff --git a/conf/machine/rock64.conf b/conf/machine/rock64.conf new file mode 100644 index 0000000..fa75a51 --- /dev/null +++ b/conf/machine/rock64.conf @@ -0,0 +1,15 @@ +# Copyright (C) 2021 Blade SAS +# Released under the MIT license (see COPYING.MIT for the terms) + +#@TYPE: Machine +#@NAME: Rock64 +#@DESCRIPTION: Rock64 RK3328 board from Pine64 + +require include/rk3328.inc + +MACHINE_FEATURES += "usbhost serial" + +UBOOT_MACHINE = "rock64-rk3328_defconfig" +KERNEL_DEVICETREE = "rockchip/rk3328-rock64.dtb" + +KBUILD_DEFCONFIG = "defconfig" diff --git a/conf/machine/tinker-board-s.conf b/conf/machine/tinker-board-s.conf index f7b17e4..3a65613 100644 --- a/conf/machine/tinker-board-s.conf +++ b/conf/machine/tinker-board-s.conf @@ -5,23 +5,7 @@ #@NAME: Tinker-S RK3288 #@DESCRIPTION: ASUS Tinker Board is a Raspberry Pi 3 Alternative based on Rockchip RK3288 Processor. -require conf/machine/include/rk3288.inc +require conf/machine/include/tinker.inc -KERNEL_DEVICETREE = "rk3288-tinker-s.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-tinker-s.dtb" UBOOT_MACHINE = "tinker-s-rk3288_defconfig" - -RK_BOOT_DEVICE ?= "mmcblk1" - -WKS_FILE ?= "tinker-board.wks" -IMAGE_FSTYPES += "wic wic.bmap" - -WKS_FILE_DEPENDS ?= " \ - mtools-native \ - dosfstools-native \ - virtual/bootloader \ - virtual/kernel \ - " -IMAGE_BOOT_FILES ?= "\ - ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ - " diff --git a/conf/machine/tinker-board.conf b/conf/machine/tinker-board.conf index 1c3c08a..ef1a1c1 100644 --- a/conf/machine/tinker-board.conf +++ b/conf/machine/tinker-board.conf @@ -5,21 +5,7 @@ #@NAME: Tinker RK3288 #@DESCRIPTION: ASUS Tinker Board is a Raspberry Pi 3 Alternative based on Rockchip RK3288 Processor. -require conf/machine/include/rk3288.inc +require conf/machine/include/tinker.inc -KERNEL_DEVICETREE = "rk3288-tinker.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-tinker.dtb" UBOOT_MACHINE = "tinker-rk3288_defconfig" - -WKS_FILE ?= "tinker-board.wks" -IMAGE_FSTYPES += "wic wic.bmap" - -WKS_FILE_DEPENDS ?= " \ - mtools-native \ - dosfstools-native \ - virtual/bootloader \ - virtual/kernel \ - " -IMAGE_BOOT_FILES ?= "\ - ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ - " diff --git a/conf/machine/vyasa-rk3288.conf b/conf/machine/vyasa-rk3288.conf index c92c821..52b4401 100644 --- a/conf/machine/vyasa-rk3288.conf +++ b/conf/machine/vyasa-rk3288.conf @@ -6,24 +6,10 @@ #@DESCRIPTION: Amarula Vyasa is Rockchip RK3288 SOC based Single board computer with fully supported opensource software. require conf/machine/include/rk3288.inc +require conf/machine/include/rockchip-wic.inc KERNEL_IMAGETYPE = "uImage" -KERNEL_DEVICETREE = "rk3288-vyasa.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-vyasa.dtb" KERNEL_EXTRA_ARGS += "LOADADDR=0x02000000" UBOOT_MACHINE = "vyasa-rk3288_defconfig" - -RK_BOOT_DEVICE = "mmcblk2" -WKS_FILE ?= "vyasa-rk3288.wks" -IMAGE_FSTYPES += "wic wic.bmap" - -WKS_FILE_DEPENDS ?= " \ - mtools-native \ - dosfstools-native \ - virtual/bootloader \ - virtual/kernel \ - " -IMAGE_BOOT_FILES ?= "\ - ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ - " diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend new file mode 100644 index 0000000..0ced545 --- /dev/null +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -0,0 +1,9 @@ +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_FONTS:rk3399 = "fontconfig" + +PACKAGECONFIG:append:rk3399 = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove:rk3399 = "tests" diff --git a/recipes-bsp/rkbin/rk3308-rkbin_git.bb b/recipes-bsp/rkbin/rk3308-rkbin_git.bb new file mode 100644 index 0000000..c6b05b2 --- /dev/null +++ b/recipes-bsp/rkbin/rk3308-rkbin_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Rockchip Firmware and Tool Binaries" +LICENSE = "CLOSED" +LIC_FILES_CHKSUM:rk3308 = "file://README;md5=39cc9df955478b8df26158d489fdcc95" + +SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" +SRCREV = "e65b97b511f1349156702db40694454c141d8fe2" + +PROVIDES += "trusted-firmware-a" +PROVIDES += "optee-os" + +inherit bin_package deploy + +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:rk3308 = "rk3308" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + # Nothing in this recipe is useful in a filesystem + : +} + +PACKAGES = "${PN}" +ALLOW_EMPTY:${PN} = "1" + +do_deploy:rk3308() { + # Prebuilt TF-A + install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3308.elf + # Prebuilt OPTEE-OS + install -m 644 ${S}/bin/rk33/rk3308_bl32_v*.bin ${DEPLOYDIR}/tee-rk3308.bin + # Prebuilt U-Boot TPL (DDR init) + install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart0_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin +} + +do_deploy() { + bbfatal "COMPATIBLE_MACHINE requires a corresponding do_deploy:<MACHINE>() override" +} + +addtask deploy after do_install diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb new file mode 100644 index 0000000..7929c6a --- /dev/null +++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "Rockchip Firmware and Tool Binaries" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" + +SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" +SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" + +PROVIDES += "trusted-firmware-a" +PROVIDES += "optee-os" + +inherit bin_package deploy + +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:rk3308 = "rk3308" +COMPATIBLE_MACHINE:rk3568 = "rk3568" +COMPATIBLE_MACHINE:rk3588s = "rk3588s" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + # Nothing in this recipe is useful in a filesystem + : +} + +PACKAGES = "${PN}" +ALLOW_EMPTY:${PN} = "1" + +do_deploy:rk3308() { + # Prebuilt TF-A + install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3308.elf + # Prebuilt OPTEE-OS + install -m 644 ${S}/bin/rk33/rk3308_bl32_v*.bin ${DEPLOYDIR}/tee-rk3308.bin + # Prebuilt U-Boot TPL (DDR init) + install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin +} + +do_deploy:rk3568() { + # Prebuilt TF-A + install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elf + # Prebuilt OPTEE-OS + install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3568.bin + # Prebuilt U-Boot TPL (DDR init) + install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.18.bin ${DEPLOYDIR}/ddr-rk3568.bin +} + +do_deploy:rk3588s() { + # Prebuilt TF-A + install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3588.elf + # Prebuilt OPTEE-OS + install -m 644 ${S}/bin/rk35/rk3588_bl32_v*.bin ${DEPLOYDIR}/tee-rk3588.bin + # Prebuilt U-Boot TPL (DDR init) + install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin ${DEPLOYDIR}/ddr-rk3588.bin +} + +do_deploy() { + bbfatal "COMPATIBLE_MACHINE requires a corresponding do_deploy:<MACHINE>() override" +} + +addtask deploy after do_install diff --git a/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch b/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch new file mode 100644 index 0000000..120ea0b --- /dev/null +++ b/recipes-bsp/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch @@ -0,0 +1,35 @@ +From a09a1de53aba422249a8376b0d95024200021317 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 + diff --git a/recipes-bsp/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch b/recipes-bsp/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch new file mode 100644 index 0000000..8807fca --- /dev/null +++ b/recipes-bsp/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch @@ -0,0 +1,31 @@ +From 5f78ce7eb9ab6bf5af682a715a9264d2a5ee7666 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 May 2021 12:06:34 -0700 +Subject: [PATCH] plat_macros.S: Use compatible .asciz asm directive + +clang asm does not like two strings to .asciz therefore make it single +string which works on clang too. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plat/rockchip/common/include/plat_macros.S | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/plat/rockchip/common/include/plat_macros.S b/plat/rockchip/common/include/plat_macros.S +index 691beeb44..c07be9ca9 100644 +--- a/plat/rockchip/common/include/plat_macros.S ++++ b/plat/rockchip/common/include/plat_macros.S +@@ -23,8 +23,7 @@ icc_regs: + + /* Registers common to both GICv2 and GICv3 */ + gicd_pend_reg: +- .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n" \ +- " Offset:\t\t\tvalue\n" ++ .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n Offset:\t\t\tvalue\n" + newline: + .asciz "\n" + spacer: +-- +2.31.1 + diff --git a/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch b/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch new file mode 100644 index 0000000..bd4d2b5 --- /dev/null +++ b/recipes-bsp/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch @@ -0,0 +1,35 @@ +From 9d963cd69faf94bdcb80624132fd10392f57875b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 + diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 2374205..c9ad84c 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,6 +1,34 @@ # 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 = " gcc-arm-none-eabi-native" -COMPATIBLE_MACHINE_append_rk3399 = "|rk3399" +COMPATIBLE_MACHINE:append:rk3399 = "|rk3399" +COMPATIBLE_MACHINE:append:rk3328 = "|rk3328" +COMPATIBLE_MACHINE:append:px30 = "|px30" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI += "\ + file://0001-dram-Fix-build-with-gcc-11.patch \ + file://0001-plat_macros.S-Use-compatible-.asciz-asm-directive.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 +TOOLCHAIN:rk3399 = "gcc" + +fixup_baudrate() { + : +} + +fixup_baudrate:rk3399() { + sed -i "s/#define RK3399_BAUDRATE\s\+.*/#define RK3399_BAUDRATE ${RK_CONSOLE_BAUD}/" ${S}/plat/rockchip/rk3399/rk3399_def.h +} + +fixup_baudrate:px30() { + sed -i "s/#define PX30_BAUDRATE\s\+.*/#define PX30_BAUDRATE ${RK_CONSOLE_BAUD}/" ${S}/plat/rockchip/px30/px30_def.h +} + +do_patch[postfuncs] += "fixup_baudrate" diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend deleted file mode 100644 index 042507d..0000000 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -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} - fi -} - -ATF_DEPENDS ??= "" - -EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy" - -do_compile[depends] .= "${ATF_DEPENDS}" - diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend new file mode 100644 index 0000000..a83179a --- /dev/null +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -0,0 +1,36 @@ +# various machines require the pyelftools library for parsing dtb files +DEPENDS:append = " python3-pyelftools-native" +DEPENDS:append:rk3308 = " u-boot-tools-native" +DEPENDS:append:rock-pi-4 = " gnutls-native" + +EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" +EXTRA_OEMAKE:append:rk3308 = " \ + BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3308.elf \ + ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin \ + " +EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" +EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" +EXTRA_OEMAKE:append:rk3568 = " \ + BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3568.elf \ + ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin \ + " +EXTRA_OEMAKE:append:rk3588s = " \ + BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \ + ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \ + " + +INIT_FIRMWARE_DEPENDS ??= "" +INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3308 = " ${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin', 'rk3308-rkbin', d)}:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3568 = " rockchip-rkbin:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" +do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}" + +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} + fi +} diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 3e8711c..58c25e7 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,2 +1,4 @@ -PACKAGECONFIG_append_rk3288 = " kmsro panfrost" -PACKAGECONFIG_append_rk3399 = " kmsro panfrost" +PACKAGECONFIG:append:rk3288 = " kmsro panfrost" +PACKAGECONFIG:append:rk3399 = " kmsro panfrost" +PACKAGECONFIG:append:rock64 = " kmsro lima" +PACKAGECONFIG:append:px30 = " kmsro panfrost" diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index 2f498d9..b6a63d7 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1 +1,5 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus" + +SRC_URI:append:orangepi-5-plus = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg new file mode 100644 index 0000000..e9443f1 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg @@ -0,0 +1,85 @@ +CONFIG_ARCH_ACTIONS=n +CONFIG_ARCH_AIROHA=n +CONFIG_ARCH_ALPINE=n +CONFIG_ARCH_ARTPEC=n +CONFIG_ARCH_ASPEED=n +CONFIG_ARCH_AT91=n +CONFIG_ARCH_BCM2835=n +CONFIG_ARCH_BCM=n +CONFIG_ARCH_BCMBCA=n +CONFIG_ARCH_BCMBCA_BRAHMAB15=n +CONFIG_ARCH_BCMBCA_CORTEXA7=n +CONFIG_ARCH_BCMBCA_CORTEXA9=n +CONFIG_ARCH_BCM_21664=n +CONFIG_ARCH_BCM_23550=n +CONFIG_ARCH_BCM_281XX=n +CONFIG_ARCH_BCM_5301X=n +CONFIG_ARCH_BCM_53573=n +CONFIG_ARCH_BCM_CYGNUS=n +CONFIG_ARCH_BCM_HR2=n +CONFIG_ARCH_BCM_NSP=n +CONFIG_ARCH_BERLIN=n +CONFIG_ARCH_BRCMSTB=n +CONFIG_ARCH_DIGICOLOR=n +CONFIG_ARCH_EMEV2=n +CONFIG_ARCH_EXYNOS=n +CONFIG_ARCH_HI3xxx=n +CONFIG_ARCH_HIGHBANK=n +CONFIG_ARCH_HIP01=n +CONFIG_ARCH_HIP04=n +CONFIG_ARCH_HISI=n +CONFIG_ARCH_HIX5HD2=n +CONFIG_ARCH_HPE=n +CONFIG_ARCH_HPE_GXP=n +CONFIG_ARCH_INTEL_SOCFPGA=n +CONFIG_ARCH_KEYSTONE=n +CONFIG_ARCH_MEDIATEK=n +CONFIG_ARCH_MESON=n +CONFIG_ARCH_MILBEAUT=n +CONFIG_ARCH_MILBEAUT_M10V=n +CONFIG_ARCH_MMP=n +CONFIG_ARCH_MSM8916=n +CONFIG_ARCH_MSM8960=n +CONFIG_ARCH_MSM8974=n +CONFIG_ARCH_MSM8X60=n +CONFIG_ARCH_MVEBU=n +CONFIG_ARCH_MXC=n +CONFIG_ARCH_OMAP3=n +CONFIG_ARCH_OMAP4=n +CONFIG_ARCH_QCOM=n +CONFIG_ARCH_R7S72100=n +CONFIG_ARCH_R7S9210=n +CONFIG_ARCH_R8A73A4=n +CONFIG_ARCH_R8A7740=n +CONFIG_ARCH_R8A7742=n +CONFIG_ARCH_R8A7743=n +CONFIG_ARCH_R8A7744=n +CONFIG_ARCH_R8A7745=n +CONFIG_ARCH_R8A77470=n +CONFIG_ARCH_R8A7778=n +CONFIG_ARCH_R8A7779=n +CONFIG_ARCH_R8A7790=n +CONFIG_ARCH_R8A7791=n +CONFIG_ARCH_R8A7792=n +CONFIG_ARCH_R8A7793=n +CONFIG_ARCH_R8A7794=n +CONFIG_ARCH_R9A06G032=n +CONFIG_ARCH_RENESAS=n +CONFIG_ARCH_SH73A0=n +CONFIG_ARCH_SPEAR13XX=n +CONFIG_ARCH_STI=n +CONFIG_ARCH_STM32=n +CONFIG_ARCH_SUNPLUS=n +CONFIG_ARCH_SUNXI=n +CONFIG_ARCH_TEGRA=n +CONFIG_ARCH_TEGRA_114_SOC=n +CONFIG_ARCH_TEGRA_124_SOC=n +CONFIG_ARCH_TEGRA_2x_SOC=n +CONFIG_ARCH_TEGRA_3x_SOC=n +CONFIG_ARCH_U8500=n +CONFIG_ARCH_UNIPHIER=n +CONFIG_ARCH_VEXPRESS=n +CONFIG_ARCH_VEXPRESS_TC2_PM=n +CONFIG_ARCH_VIRT=n +CONFIG_ARCH_WM8850=n +CONFIG_ARCH_ZYNQ=n diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc new file mode 100644 index 0000000..ce77704 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc @@ -0,0 +1 @@ +kconf hardware remove-non-rockchip-arch-arm.cfg diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg new file mode 100644 index 0000000..5b804a2 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg @@ -0,0 +1,66 @@ +CONFIG_ARCH_ACTIONS=n +CONFIG_ARCH_ALPINE=n +CONFIG_ARCH_APPLE=n +CONFIG_ARCH_BCM2835=n +CONFIG_ARCH_BCM=n +CONFIG_ARCH_BCMBCA=n +CONFIG_ARCH_BCM_IPROC=n +CONFIG_ARCH_BERLIN=n +CONFIG_ARCH_BRCMSTB=n +CONFIG_ARCH_EXYNOS=n +CONFIG_ARCH_SPARX5=n +CONFIG_ARCH_HISI=n +CONFIG_ARCH_INTEL_SOCFPGA=n +CONFIG_ARCH_K3=n +CONFIG_ARCH_KEEMBAY=n +CONFIG_ARCH_LAYERSCAPE=n +CONFIG_ARCH_LG1K=n +CONFIG_ARCH_MEDIATEK=n +CONFIG_ARCH_MESON=n +CONFIG_ARCH_MVEBU=n +CONFIG_ARCH_MXC=n +CONFIG_ARCH_NPCM=n +CONFIG_ARCH_NXP=n +CONFIG_ARCH_MA35=n +CONFIG_ARCH_QCOM=n +CONFIG_ARCH_REALTEK=n +CONFIG_ARCH_R8A774A1=n +CONFIG_ARCH_R8A774B1=n +CONFIG_ARCH_R8A774C0=n +CONFIG_ARCH_R8A774E1=n +CONFIG_ARCH_R8A77951=n +CONFIG_ARCH_R8A77960=n +CONFIG_ARCH_R8A77961=n +CONFIG_ARCH_R8A77965=n +CONFIG_ARCH_R8A77970=n +CONFIG_ARCH_R8A77980=n +CONFIG_ARCH_R8A77990=n +CONFIG_ARCH_R8A77995=n +CONFIG_ARCH_R8A779A0=n +CONFIG_ARCH_R8A779F0=n +CONFIG_ARCH_R8A779G0=n +CONFIG_ARCH_R9A07G043=n +CONFIG_ARCH_R9A07G044=n +CONFIG_ARCH_R9A07G054=n +CONFIG_ARCH_R9A09G011=n +CONFIG_ARCH_RENESAS=n +CONFIG_ARCH_S32=n +CONFIG_ARCH_SEATTLE=n +CONFIG_ARCH_STM32=n +CONFIG_ARCH_SPRD=n +CONFIG_ARCH_SUNXI=n +CONFIG_ARCH_SYNQUACER=n +CONFIG_ARCH_TEGRA=n +CONFIG_ARCH_TEGRA_132_SOC=n +CONFIG_ARCH_TEGRA_186_SOC=n +CONFIG_ARCH_TEGRA_194_SOC=n +CONFIG_ARCH_TEGRA_210_SOC=n +CONFIG_ARCH_TEGRA_234_SOC=n +CONFIG_ARCH_TESLA_FSD=n +CONFIG_ARCH_THUNDER2=n +CONFIG_ARCH_THUNDER=n +CONFIG_ARCH_UNIPHIER=n +CONFIG_ARCH_VEXPRESS=n +CONFIG_ARCH_VISCONTI=n +CONFIG_ARCH_XGENE=n +CONFIG_ARCH_ZYNQMP=n diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc new file mode 100644 index 0000000..e169240 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc @@ -0,0 +1 @@ +kconf hardware remove-non-rockchip-arch-arm64.cfg diff --git a/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend deleted file mode 100644 index 2f498d9..0000000 --- a/recipes-kernel/linux/linux-yocto-rt_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288" diff --git a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend deleted file mode 100644 index 2f498d9..0000000 --- a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288" diff --git a/recipes-kernel/linux/linux-yocto/0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch b/recipes-kernel/linux/linux-yocto/0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch deleted file mode 100644 index 751f1ad..0000000 --- a/recipes-kernel/linux/linux-yocto/0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 04ab2a1f052f363985b373f07ea71840918378d2 Mon Sep 17 00:00:00 2001 -From: Joshua Watt <JPEWhacker@gmail.com> -Date: Wed, 19 Feb 2020 13:10:32 -0600 -Subject: [PATCH] ARM: dts: rockchip: Keep rk3288-tinker SD card IO powered - during reboot - -IO voltage regulator for the SD card must be kept on all the time, -otherwise when the board reboots the SD card can't be read by the -bootloader. - -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> -Upstream-Status: Accepted in 5.7 ---- - arch/arm/boot/dts/rk3288-tinker.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi -index 312582c1bd37..acfaa12ec239 100644 ---- a/arch/arm/boot/dts/rk3288-tinker.dtsi -+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi -@@ -276,6 +276,7 @@ - }; - - vccio_sd: LDO_REG5 { -+ regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; --- -2.17.1 - diff --git a/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc new file mode 100644 index 0000000..266b77c --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/nanopi-r4s.scc @@ -0,0 +1,6 @@ +define KFEATURE_DESCRIPTION "tweaks for the nanopi-r4s" +define KMACHINE nanopi-r4s +define KTYPE standard +define KARCH arm64 + +include bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch new file mode 100644 index 0000000..e1f2b92 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/0001-rk3399-nanopi-r4s.dts-enable-second-ethernet.patch @@ -0,0 +1,41 @@ +From 4c867907b68b417da0711cabdde30a969e368596 Mon Sep 17 00:00:00 2001 +From: Trevor Woerner <twoerner@gmail.com> +Date: Sun, 17 Sep 2023 17:30:43 -0400 +Subject: [PATCH] rk3399-nanopi-r4s.dts: enable second ethernet + +# lspci +00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3399 PCI Express Root Port +01:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ether) + +Link: https://github.com/armbian/build/pull/2415 +Upstream-Status: Submitted [by someone else] +Signed-off-by: Trevor Woerner <twoerner@gmail.com> +--- + arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +index fe5b52610010..771615722358 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +@@ -76,6 +76,17 @@ &pcie0 { + max-link-speed = <1>; + num-lanes = <1>; + vpcie3v3-supply = <&vcc3v3_sys>; ++ ++ pcie@0 { ++ reg = <0x00000000 0 0 0 0>; ++ #address-cells = <3>; ++ #size-cells = <2>; ++ ++ r8169: pcie@0,0 { ++ reg = <0x000000 0 0 0 0>; ++ local-mac-address = [ 00 00 00 00 00 00 ]; ++ }; ++ }; + }; + + &pinctrl { +-- +2.41.0.327.gaa9166bcc0ba + diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg new file mode 100644 index 0000000..e9443f1 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg @@ -0,0 +1,85 @@ +CONFIG_ARCH_ACTIONS=n +CONFIG_ARCH_AIROHA=n +CONFIG_ARCH_ALPINE=n +CONFIG_ARCH_ARTPEC=n +CONFIG_ARCH_ASPEED=n +CONFIG_ARCH_AT91=n +CONFIG_ARCH_BCM2835=n +CONFIG_ARCH_BCM=n +CONFIG_ARCH_BCMBCA=n +CONFIG_ARCH_BCMBCA_BRAHMAB15=n +CONFIG_ARCH_BCMBCA_CORTEXA7=n +CONFIG_ARCH_BCMBCA_CORTEXA9=n +CONFIG_ARCH_BCM_21664=n +CONFIG_ARCH_BCM_23550=n +CONFIG_ARCH_BCM_281XX=n +CONFIG_ARCH_BCM_5301X=n +CONFIG_ARCH_BCM_53573=n +CONFIG_ARCH_BCM_CYGNUS=n +CONFIG_ARCH_BCM_HR2=n +CONFIG_ARCH_BCM_NSP=n +CONFIG_ARCH_BERLIN=n +CONFIG_ARCH_BRCMSTB=n +CONFIG_ARCH_DIGICOLOR=n +CONFIG_ARCH_EMEV2=n +CONFIG_ARCH_EXYNOS=n +CONFIG_ARCH_HI3xxx=n +CONFIG_ARCH_HIGHBANK=n +CONFIG_ARCH_HIP01=n +CONFIG_ARCH_HIP04=n +CONFIG_ARCH_HISI=n +CONFIG_ARCH_HIX5HD2=n +CONFIG_ARCH_HPE=n +CONFIG_ARCH_HPE_GXP=n +CONFIG_ARCH_INTEL_SOCFPGA=n +CONFIG_ARCH_KEYSTONE=n +CONFIG_ARCH_MEDIATEK=n +CONFIG_ARCH_MESON=n +CONFIG_ARCH_MILBEAUT=n +CONFIG_ARCH_MILBEAUT_M10V=n +CONFIG_ARCH_MMP=n +CONFIG_ARCH_MSM8916=n +CONFIG_ARCH_MSM8960=n +CONFIG_ARCH_MSM8974=n +CONFIG_ARCH_MSM8X60=n +CONFIG_ARCH_MVEBU=n +CONFIG_ARCH_MXC=n +CONFIG_ARCH_OMAP3=n +CONFIG_ARCH_OMAP4=n +CONFIG_ARCH_QCOM=n +CONFIG_ARCH_R7S72100=n +CONFIG_ARCH_R7S9210=n +CONFIG_ARCH_R8A73A4=n +CONFIG_ARCH_R8A7740=n +CONFIG_ARCH_R8A7742=n +CONFIG_ARCH_R8A7743=n +CONFIG_ARCH_R8A7744=n +CONFIG_ARCH_R8A7745=n +CONFIG_ARCH_R8A77470=n +CONFIG_ARCH_R8A7778=n +CONFIG_ARCH_R8A7779=n +CONFIG_ARCH_R8A7790=n +CONFIG_ARCH_R8A7791=n +CONFIG_ARCH_R8A7792=n +CONFIG_ARCH_R8A7793=n +CONFIG_ARCH_R8A7794=n +CONFIG_ARCH_R9A06G032=n +CONFIG_ARCH_RENESAS=n +CONFIG_ARCH_SH73A0=n +CONFIG_ARCH_SPEAR13XX=n +CONFIG_ARCH_STI=n +CONFIG_ARCH_STM32=n +CONFIG_ARCH_SUNPLUS=n +CONFIG_ARCH_SUNXI=n +CONFIG_ARCH_TEGRA=n +CONFIG_ARCH_TEGRA_114_SOC=n +CONFIG_ARCH_TEGRA_124_SOC=n +CONFIG_ARCH_TEGRA_2x_SOC=n +CONFIG_ARCH_TEGRA_3x_SOC=n +CONFIG_ARCH_U8500=n +CONFIG_ARCH_UNIPHIER=n +CONFIG_ARCH_VEXPRESS=n +CONFIG_ARCH_VEXPRESS_TC2_PM=n +CONFIG_ARCH_VIRT=n +CONFIG_ARCH_WM8850=n +CONFIG_ARCH_ZYNQ=n diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc new file mode 100644 index 0000000..ce77704 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc @@ -0,0 +1 @@ +kconf hardware remove-non-rockchip-arch-arm.cfg diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg new file mode 100644 index 0000000..597d47a --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg @@ -0,0 +1,62 @@ +CONFIG_ARCH_ACTIONS=n +CONFIG_ARCH_ALPINE=n +CONFIG_ARCH_APPLE=n +CONFIG_ARCH_BCM2835=n +CONFIG_ARCH_BCM=n +CONFIG_ARCH_BCMBCA=n +CONFIG_ARCH_BCM_IPROC=n +CONFIG_ARCH_BERLIN=n +CONFIG_ARCH_BRCMSTB=n +CONFIG_ARCH_EXYNOS=n +CONFIG_ARCH_HISI=n +CONFIG_ARCH_INTEL_SOCFPGA=n +CONFIG_ARCH_K3=n +CONFIG_ARCH_KEEMBAY=n +CONFIG_ARCH_LAYERSCAPE=n +CONFIG_ARCH_LG1K=n +CONFIG_ARCH_MEDIATEK=n +CONFIG_ARCH_MESON=n +CONFIG_ARCH_MVEBU=n +CONFIG_ARCH_MXC=n +CONFIG_ARCH_NPCM=n +CONFIG_ARCH_NXP=n +CONFIG_ARCH_QCOM=n +CONFIG_ARCH_R8A774A1=n +CONFIG_ARCH_R8A774B1=n +CONFIG_ARCH_R8A774C0=n +CONFIG_ARCH_R8A774E1=n +CONFIG_ARCH_R8A77951=n +CONFIG_ARCH_R8A77960=n +CONFIG_ARCH_R8A77961=n +CONFIG_ARCH_R8A77965=n +CONFIG_ARCH_R8A77970=n +CONFIG_ARCH_R8A77980=n +CONFIG_ARCH_R8A77990=n +CONFIG_ARCH_R8A77995=n +CONFIG_ARCH_R8A779A0=n +CONFIG_ARCH_R8A779F0=n +CONFIG_ARCH_R8A779G0=n +CONFIG_ARCH_R9A07G043=n +CONFIG_ARCH_R9A07G044=n +CONFIG_ARCH_R9A07G054=n +CONFIG_ARCH_R9A09G011=n +CONFIG_ARCH_RENESAS=n +CONFIG_ARCH_S32=n +CONFIG_ARCH_SEATTLE=n +CONFIG_ARCH_SPRD=n +CONFIG_ARCH_SUNXI=n +CONFIG_ARCH_SYNQUACER=n +CONFIG_ARCH_TEGRA=n +CONFIG_ARCH_TEGRA_132_SOC=n +CONFIG_ARCH_TEGRA_186_SOC=n +CONFIG_ARCH_TEGRA_194_SOC=n +CONFIG_ARCH_TEGRA_210_SOC=n +CONFIG_ARCH_TEGRA_234_SOC=n +CONFIG_ARCH_TESLA_FSD=n +CONFIG_ARCH_THUNDER2=n +CONFIG_ARCH_THUNDER=n +CONFIG_ARCH_UNIPHIER=n +CONFIG_ARCH_VEXPRESS=n +CONFIG_ARCH_VISCONTI=n +CONFIG_ARCH_XGENE=n +CONFIG_ARCH_ZYNQMP=n diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc new file mode 100644 index 0000000..e169240 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc @@ -0,0 +1 @@ +kconf hardware remove-non-rockchip-arch-arm64.cfg diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 97b8cda..5528bab 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,2 +1,27 @@ -COMPATIBLE_MACHINE .= "|firefly-rk3288|marsboard-rk3066|radxarock|rock-pi-4|rock2-square|tinker-board-s|tinker-board|vyasa-rk3288" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +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:nanopi-r4s = "nanopi-r4s" +COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s" +COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b" +COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s" +COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc" +COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc" +COMPATIBLE_MACHINE:rock-3a = "rock-3a" +COMPATIBLE_MACHINE:rock-4c-plus = "rock-4c-plus" +COMPATIBLE_MACHINE:rock-5a = "rock-5a" +COMPATIBLE_MACHINE:rock-5b = "rock-5b" + +SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" +SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc" diff --git a/recipes-kernel/linux/linux-yocto_5.4.bbappend b/recipes-kernel/linux/linux-yocto_5.4.bbappend deleted file mode 100644 index e832529..0000000 --- a/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -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" - diff --git a/wic/firefly-rk3288.wks b/wic/firefly-rk3288.wks deleted file mode 100644 index da0067f..0000000 --- a/wic/firefly-rk3288.wks +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -include rk3288-boot.wks -part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root - -bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init" diff --git a/wic/rk3288-boot.wks b/wic/rk3288-boot.wks deleted file mode 100644 index e4d30cc..0000000 --- a/wic/rk3288-boot.wks +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2020 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) -# -# Disk layout -# Note that the reference documentation refers to 512 byte disk sectors, but -# wic uses 1KB blocks -# -# Partition Start Sector Number of Sectors -# loader1 64 8000 -# reserved1 8064 128 -# reserved2 8192 8192 -# loader2 16384 8192 -# atf 24576 8192 -# boot 32768 229376 -# root 262144 - (suggested) -# - -part loader1 --offset 32 --fixed-size 4000K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img" -part reserved1 --offset 4032 --fixed-size 64K --ondisk ${RK_BOOT_DEVICE} -part reserved2 --offset 4096 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} -part loader2 --offset 8192 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.bin" -part atf --offset 12288 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} -part /boot --offset 16384 --size 114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot" - diff --git a/wic/rk3399-boot.wks b/wic/rk3399-boot.wks deleted file mode 100644 index 8a65179..0000000 --- a/wic/rk3399-boot.wks +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2020 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) -# -# Disk layout -# Note that the reference documentation refers to 512 byte disk sectors, but -# wic uses 1KB blocks -# -# Partition Start Sector Number of Sectors -# loader1 64 8000 -# reserved1 8064 128 -# reserved2 8192 8192 -# loader2 16384 8192 -# atf 24576 8192 -# boot 32768 229376 -# root 262144 - (suggested) -# - -part loader1 --offset 32 --fixed-size 4000K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img" -part reserved1 --offset 4032 --fixed-size 64K --ondisk ${RK_BOOT_DEVICE} -part reserved2 --offset 4096 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} -part loader2 --offset 8192 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.itb" -part atf --offset 12288 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} -part /boot --offset 16384 --size 114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot" - diff --git a/wic/rock-pi-4.wks b/wic/rock-pi-4.wks deleted file mode 100644 index c6174a9..0000000 --- a/wic/rock-pi-4.wks +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (C) 2020 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -include rk3399-boot.wks -part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root - -bootloader --ptable gpt --append="console=tty1 console=ttyS2,1500000n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init" diff --git a/wic/rockchip.wks b/wic/rockchip.wks new file mode 100644 index 0000000..9ba3352 --- /dev/null +++ b/wic/rockchip.wks @@ -0,0 +1,31 @@ +# Copyright (C) 2019,2020 Garmin Ltd. or its subsidiaries +# Copyright (C) 2021 Trevor Woerner +# Released under the MIT license (see COPYING.MIT for the terms) +# +# short-description: Create a disk image suitable for booting Rockchip from SD-card +# long-description: Creates a disk image partitioned using GPT, suitable for Rockchip +# Disk layout +# See: https://opensource.rock-chips.com/wiki_Partitions +# +# Partition Start Sector Number of Sectors +# loader1 64 7104 (idbloader / U-Boot SPL) +# v_storage 7168 512 (vendor storage: e.g. serial number, MAC address, etc) +# reserved 7680 384 (not used) +# reserved1 8064 64 (legacy DRM key) +# uboot_env 8128 64 (U-Boot environment) +# reserved2 8192 8192 (legacy parameters, ATAGS, etc) +# loader2 16384 8192 (U-Boot proper) +# atf 24576 8192 (trusted OS e.g. ATF, OP-TEE, etc) +# root 32768 - + +part loader1 --offset 64s --fixed-size 3552K --fstype=none --part-name loader1 --source rawcopy --sourceparams="file=${SPL_BINARY}" +part v_storage --offset 7168s --fixed-size 256K --fstype=none --part-name v_storage +part reserved --offset 7680s --fixed-size 192K --fstype=none --part-name reserved +part reserved1 --offset 8064s --fixed-size 32K --fstype=none --part-name reserved1 +part uboot_env --offset 8128s --fixed-size 32K --fstype=none --part-name uboot_env +part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --part-name reserved2 +part loader2 --offset 16384s --fixed-size 4096K --fstype=none --part-name loader2 --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" +part atf --offset 24576s --fixed-size 4096K --fstype=none --part-name atf +part / --label root --active --fstype=ext4 --part-name root --source rootfs + +bootloader --ptable gpt diff --git a/wic/tinker-board.wks b/wic/tinker-board.wks deleted file mode 100644 index 5a63ce0..0000000 --- a/wic/tinker-board.wks +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -include rk3288-boot.wks - -part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root - -bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init" diff --git a/wic/vyasa-rk3288.wks b/wic/vyasa-rk3288.wks deleted file mode 100644 index 5db65df..0000000 --- a/wic/vyasa-rk3288.wks +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -include rk3288-boot.wks -part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root - -bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init" - |