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

rock-pi-4: Split our variant machines

Browse Source 
Splits out the three variants of the rock-pi-4 (A, B & C) into their own
machines. Unfortunately, it is not possible to have a single machine
that works for all three, as there isn't any known ways for the
bootloader to distinguish them. The old rock-pi-4 machine is kept around
for use with older kernels

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
This commit is contained in:
Joshua Watt 2021-01-25 19:30:43 -06:00 committed by Trevor Woerner
parent abafbdbacf
commit ad65fd7736
6 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,8 @@ 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/tune-cortexa72-cortexa53.inc
require conf/machine/include/rockchip-defaults.inc
KBUILD_DEFCONFIG ?= "defconfig"

22
conf/machine/include/rock-pi-4.inc Normal file
View File

@ -0,0 +1,22 @@
# Add a common override for all Rock Pi 4 machines
MACHINEOVERRIDES =. "rock-pi-4:"
require conf/machine/include/rk3399.inc
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"

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

@ -4,26 +4,12 @@
#@TYPE: Machine
#@NAME: Rock Pi 4 RK3399
#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor.
#
# NOTE: This machine is for Kernels before 5.10. If you are using an newer kernel
# see rock-pi-4{a,b,c}.conf
require conf/machine/include/rk3399.inc
require conf/machine/include/rock-pi-4.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"

11
conf/machine/rock-pi-4a.conf Normal file
View File

@ -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"

11
conf/machine/rock-pi-4b.conf Normal file
View File

@ -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"

11
conf/machine/rock-pi-4c.conf Normal file
View File

@ -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"