diff --git a/README b/README index a9a040a..909840d 100644 --- a/README +++ b/README @@ -41,6 +41,7 @@ Status of supported boards: rock-3a rock-4c-plus radxa-zero-3e + radxa-zero-3w builds: marsboard-rk3066 radxarock diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc new file mode 100644 index 0000000..1c6f972 --- /dev/null +++ b/conf/machine/include/radxa-zero-3.inc @@ -0,0 +1,8 @@ +MACHINEOVERRIDES =. "radxa-zero-3:" + +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/conf/machine/radxa-zero-3e.conf b/conf/machine/radxa-zero-3e.conf index 3a39d6c..37792cb 100644 --- a/conf/machine/radxa-zero-3e.conf +++ b/conf/machine/radxa-zero-3e.conf @@ -3,10 +3,5 @@ #@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. #http://radxa.com/products/zeros/zero3e/ -require conf/machine/include/rk3566.inc - -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +require conf/machine/include/radxa-zero-3.inc KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" - -UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/conf/machine/radxa-zero-3w.conf b/conf/machine/radxa-zero-3w.conf new file mode 100644 index 0000000..5193d45 --- /dev/null +++ b/conf/machine/radxa-zero-3w.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3W +#@DESCRIPTION: The Radxa ZERO 3w is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3w/ + +require conf/machine/include/radxa-zero-3.inc +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3w.dtb" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index e1ee17e..de70245 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -2,9 +2,9 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:radxa-zero-3e = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" -SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" -SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" +SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a" diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb index a932f53..9a95eb5 100644 --- a/recipes-kernel/linux/linux-torvalds-next_git.bb +++ b/recipes-kernel/linux/linux-torvalds-next_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEFAULT_PREFERENCE = "-1" COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:radxa-zero-3e = "radxa-zero-3e" +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" LINUX_VERSION = "6.10-rc3" PV = "${LINUX_VERSION}+git${SRCPV}"