rock-pi-4: Split our variant machines
PATCH 1/1 rock-pi-4: Split our variant machines
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.
---
conf/machine/include/rk3399.inc | 2 +-
conf/machine/{rock-pi-4.conf => include/rock-pi-4.inc} | 8 ++------
conf/machine/rock-pi-4a.conf | 8 ++++++++
conf/machine/rock-pi-4b.conf | 8 ++++++++
conf/machine/rock-pi-4c.conf | 8 ++++++++
5 files changed, 27 insertions(+), 7 deletions(-)
rename conf/machine/{rock-pi-4.conf => include/rock-pi-4.inc} (68%)
create mode 100644 conf/machine/rock-pi-4a.conf
create mode 100644 conf/machine/rock-pi-4b.conf
create mode 100644 conf/machine/rock-pi-4c.confconf/machine/include/rk3399.inc +1 -1
@@ -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"
conf/machine/include/rock-pi-4.inc renamed from conf/machine/rock-pi-4.conf +2 -6
@@ -1,15 +1,11 @@ # 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. +# Add a common override for all Rock Pi 4 machines +MACHINEOVERRIDES =. "rock-pi-4:" 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"
conf/machine/rock-pi-4a.conf new file +8 -0
@@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: Rock Pi 4A RK3399 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. + +require conf/machine/include/rock-pi-4.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4a.dtb" +UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig"
conf/machine/rock-pi-4b.conf new file +8 -0
@@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: Rock Pi 4B RK3399 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. + +require conf/machine/include/rock-pi-4.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4b.dtb" +UBOOT_MACHINE = "rock-pi-4-rk3399_defconfig"
conf/machine/rock-pi-4c.conf new file +8 -0
@@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: Rock Pi 4C RK3399 +#@DESCRIPTION: Rock Pi 4 is a Raspberry Pi 4 Alternative based on Rockchip RK3399 Processor. + +require conf/machine/include/rock-pi-4.inc + +KERNEL_DEVICETREE = "rockchip/rk3399-rock-pi-4c.dtb" +UBOOT_MACHINE = "rock-pi-4c-rk3399_defconfig"
Signature · 1 line
2.30.0
Re: [meta-rockchip][PATCH] rock-pi-4: Split our variant machinesy
Is there any way to make this work with both new (4.10, -dev, -tiny, -rt) and old (5.4) kernels? What if we left the old rock-pi-4 MACHINE for the 5.4 kernel and required one of the new ones for 5.10?
Re: [meta-rockchip][PATCH] rock-pi-4: Split our variant machinesy
Quoted 4 lines · Trevor Woerner
Is there any way to make this work with both new (4.10, -dev, -tiny, -rt) and old (5.4) kernels? What if we left the old rock-pi-4 MACHINE for the 5.4 kernel and required one of the new ones for 5.10?
Ya, we can keep the old machine around for the old kernels
PATCH v2 1/1 rock-pi-4: Split our variant machines
In reply to Joshua WattSplits 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
--- conf/machine/include/rk3399.inc | 2 +- conf/machine/include/rock-pi-4.inc | 22 ++++++++++++++++++++++ conf/machine/rock-pi-4.conf | 22 ++++------------------ conf/machine/rock-pi-4a.conf | 11 +++++++++++ conf/machine/rock-pi-4b.conf | 11 +++++++++++ conf/machine/rock-pi-4c.conf | 11 +++++++++++ 6 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 conf/machine/include/rock-pi-4.inc create mode 100644 conf/machine/rock-pi-4a.conf create mode 100644 conf/machine/rock-pi-4b.conf create mode 100644 conf/machine/rock-pi-4c.conf
conf/machine/include/rk3399.inc +1 -1
@@ -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"
conf/machine/include/rock-pi-4.inc new file +22 -0
@@ -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"
conf/machine/rock-pi-4.conf +4 -18
@@ -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"
conf/machine/rock-pi-4a.conf new file +11 -0
@@ -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"
conf/machine/rock-pi-4b.conf new file +11 -0
@@ -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"
conf/machine/rock-pi-4c.conf new file +11 -0
@@ -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"
Signature · 1 line
2.30.0
Trevor Woerner
AppliedApplied, thanks!