orangepi-rv2.conf: switch to mainline Linux, U-Boot and OpenSBI

DEPRECATED.md

@@ -8,7 +8,6 @@ of the listed releases.
 Note: The following are deprecated for 6.2, but the layer still supports
 mainline-based BSPs with similar names.
 
-- orangepi-rv2
 - eswin-ebc77
 
 ## Yocto 6.1

README.md

@@ -54,8 +54,7 @@ This layer depends on:
 | muse-pi-pro              | [Muse Pi Pro](https://www.spacemit.com/community/document/info?lang=en&nodepath=hardware/eco/k1_muse_pi_pro/root_overview.md) |                                                                 |
 | nezha-allwinner-d1       | [Nezha D1-H](https://docs.aw-ol.com/d1/en/d1_dev/)                                                           |                                                                                  |
 | orangepi-r2s             | [OrangePi R2S](http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-R2S.html) | Vendor Kernel and U-Boot                                                         |
-| orangepi-rv2             | [OrangePi RV2](http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-RV2.html) | Vendor Kernel and U-Boot                                                         |
-| orangepi-rv2-mainline    | [OrangePi RV2](http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-RV2.html) | Mainline Kernel and U-Boot (uses vendor FSBL)                                    |
+| orangepi-rv2             | [OrangePi RV2](http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-RV2.html) | Mainline Kernel and U-Boot (uses vendor FSBL)                                    |
 | star64                   | [PINE64 STAR64](https://pine64.org/devices/star64/)                                                          | 5.15 Kernel [fork](https://github.com/fishwaldo/Star64_linux)                    |
 | visionfive               | StarFive VisionFive                                                                                          | No product page found                                                            |
 | visionfive2              | [StarFive VisionFive 2](https://www.starfivetech.com/en/index.php?s=hardware&c=show&id=14)                   |                                                                                  |

bitbake-registry/meta-riscv-oe-nodistro-master.conf.json

@@ -61,8 +61,7 @@
                         { "name": "machine/muse-pi-pro", "description": "SpacemiT Muse Pi Pro" },
                         { "name": "machine/nezha-allwinner-d1", "description": "Nezha D1-H" },
                         { "name": "machine/orangepi-r2s", "description": "OrangePi R2S" },
-                        { "name": "machine/orangepi-rv2", "description": "OrangePi RV2 (Vendor Kernel)" },
-                        { "name": "machine/orangepi-rv2-mainline", "description": "OrangePi RV2 (Mainline Kernel)" },
+                        { "name": "machine/orangepi-rv2", "description": "OrangePi RV2" },
                         { "name": "machine/star64", "description": "PINE64 Star64" },
                         { "name": "machine/visionfive", "description": "StarFive VisionFive" },
                         { "name": "machine/visionfive2", "description": "StarFive VisionFive 2" }

bitbake-registry/meta-riscv-poky-master.conf.json

@@ -66,8 +66,7 @@
                         { "name": "machine/muse-pi-pro", "description": "SpacemiT Muse Pi Pro" },
                         { "name": "machine/nezha-allwinner-d1", "description": "Nezha D1-H" },
                         { "name": "machine/orangepi-r2s", "description": "OrangePi R2S" },
-                        { "name": "machine/orangepi-rv2", "description": "OrangePi RV2 (Vendor Kernel)" },
-                        { "name": "machine/orangepi-rv2-mainline", "description": "OrangePi RV2 (Mainline Kernel)" },
+                        { "name": "machine/orangepi-rv2", "description": "OrangePi RV2" },
                         { "name": "machine/star64", "description": "PINE64 Star64" },
                         { "name": "machine/visionfive", "description": "StarFive VisionFive" },
                         { "name": "machine/visionfive2", "description": "StarFive VisionFive 2" }

classes/warn-deprecated-machines.bbclass

@@ -3,7 +3,6 @@
 
 python warn_deprecated_machines() {
     deprecated_machines = {
-        "orangepi-rv2": "Yocto 6.2",
         "eswin-ebc77": "Yocto 6.2",
         "beaglev-starlight-jh7100": "Yocto 6.1",
         "visionfive": "Yocto 6.1",

conf/machine/orangepi-rv2.conf

@@ -1,15 +1,13 @@
 #@TYPE: Machine
 #@NAME: orangepi-rv2
-#@SOC: Ky X1
+#@SOC: Spacemit K1
 #@DESCRIPTION: Machine configuration for OrangePi RV2
 
-require include/k1-vendor.inc
+require include/k1.inc
 
-KERNEL_DEVICETREE ?= "ky/x1_orangepi-rv2.dtb"
+KERNEL_DEVICETREE ?= "spacemit/k1-orangepi-rv2.dtb"
 
-IMAGE_BOOT_FILES += " \
-	x1_orangepi-rv2.dtb"
-
-WKS_FILE ?= "orangepi-rv2.wks"
+# OrangePi RV2 not supported yet in mainline U-Boot. A similar machine works.
+UBOOT_MACHINE = "bananapi-f3_defconfig"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware-orangepi"

docs/orangepi-rv2-mainline.md → docs/orangepi-rv2.md

@@ -17,7 +17,7 @@ See [the Yocto Project](https://docs.yoctoproject.org/brief-yoctoprojectqs/index
 
 Set these variables in a configuration file:
 
-* `MACHINE = "orangepi-rv2-mainline"`
+* `MACHINE = "orangepi-rv2"`
 * `DISTRO = "poky-altcfg"`
 * `EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login post-install-logging"`
 
@@ -31,7 +31,7 @@ How to Build - Using Kas
 ========================
 
 ```
-$ kas build /path/to/meta-riscv/kas/orangepi-rv2-mainline.yml
+$ kas build /path/to/meta-riscv/kas/orangepi-rv2.yml
 ```
 
 The `kas` tool can be installed as a package on your distribution or
@@ -63,16 +63,16 @@ already loaded in RAM.
 Flashing the Image
 ==================
 
-Flash `core-image-full-cmdline-orangepi-rv2-mainline.rootfs.wic.gz` onto a uSD card (assuming it's accessed through `/dev/sdx`):
+Flash `core-image-full-cmdline-orangepi-rv2.rootfs.wic.gz` onto a uSD card (assuming it's accessed through `/dev/sdx`):
 
 ```
-$ sudo bmaptool copy build/tmp/deploy/images/orangepi-rv2-mainline/core-image-full-cmdline-orangepi-rv2-mainline.rootfs.wic.gz /dev/sdx
+$ sudo bmaptool copy build/tmp/deploy/images/orangepi-rv2/core-image-full-cmdline-orangepi-rv2.rootfs.wic.gz /dev/sdx
 ```
 
 Then, you also need to flash the `bootinfo_sd.bin` file at the very beginning of the SD card (not part of the WIC image yet):
 
 ```
-$ sudo dd if=build/tmp/deploy/images/orangepi-rv2-mainline/bootinfo_sd.bin of=/dev/sdx
+$ sudo dd if=build/tmp/deploy/images/orangepi-rv2/bootinfo_sd.bin of=/dev/sdx
 ```
 
 Boot the Board

recipes-bsp/opensbi/opensbi_%.bbappend

@@ -1,13 +1,11 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-BRANCH:orangepi-rv2 = "v2022.10-ky"
 # Support fdt drivers for AE350
 SRCREV:ae350-ax45mp = "22f38ee6c658a660083aa45c4ec6c72f66a17260"
 # JH7110_VF2_6.12_v6.0.0
 SRCREV:jh7100 = "1725bd71080960290fdde4499a58c25c09d5c8ee"
 SRCREV:star64 = "c6a092cd80112529cb2e92e180767ff5341b22a3"
 SRCREV:dc-roma-fml13v01 = "c6a092cd80112529cb2e92e180767ff5341b22a3"
-SRCREV:orangepi-rv2 = "89bff4a7e4cadfb5f130edb1ec44c39bff20a427"
 
 SRC_URI:star64 = "git://github.com/starfive-tech/opensbi;branch=JH7110_VisionFive2_devel;protocol=https"
 SRC_URI:append:star64 = "\
@@ -23,15 +21,9 @@ SRC_URI:append:dc-roma-fml13v01 = "\
 	file://0002-include-sbi-Fix-compiling-with-C23-enabled-compilers.patch \
 	"
 
-SRC_URI:orangepi-rv2 = "git://github.com/orangepi-xunlong/u-boot-orangepi.git;protocol=https;branch=${BRANCH}"
-SRC_URI:append:orangepi-rv2 = " file://c23-compatibility.patch"
-S:orangepi-rv2 = "${UNPACKDIR}/${BP}/opensbi"
-
 DEPENDS:append:jh7110 = " u-boot-tools-native dtc-native"
-DEPENDS:append:orangepi-rv2 = " u-boot-tools-native"
 
 EXTRA_OEMAKE:append:milkv-duo = "FW_FDT_PATH=${DEPLOY_DIR_IMAGE}/u-boot.dtb"
-EXTRA_OEMAKE:append:orangepi-rv2 = " PLATFORM_DEFCONFIG=k1_defconfig"
 
 # opensbi's own Makefile hardcodes CFLAGS and ignores TARGET_CFLAGS, so its
 # debug info embeds raw TMPDIR/HOME source paths. Skip the buildpaths QA check

recipes-bsp/u-boot/u-boot-orangepi.bb

@@ -12,7 +12,6 @@ SRCREV:k1 = "89bff4a7e4cadfb5f130edb1ec44c39bff20a427"
 SRC_URI = "git://github.com/orangepi-xunlong/u-boot-orangepi.git;protocol=https;branch=${BRANCH}"
 SRC_URI:append:k1 = " file://drop-intree-opensbi-build.patch"
 
-SRC_URI:append:orangepi-rv2 = " file://boot.cmd"
 SRC_URI:append:orangepi-r2s = " file://boot.cmd"
 
 SRC_URI:remove:riscv32:k1 = " ${SRC_URI_RISCV}"
@@ -23,17 +22,6 @@ do_configure:prepend:k1() {
 		-d ${UNPACKDIR}/${UBOOT_ENV}.${UBOOT_ENV_SRC_SUFFIX} ${UNPACKDIR}/${UBOOT_ENV_BINARY}
 }
 
-do_deploy:append:orangepi-rv2() {
-	install -m 644 ${S}/bootinfo_sd.bin ${DEPLOYDIR}/
-	cp ${DEPLOY_DIR_IMAGE}/fw_dynamic.bin ${B}/
-	cp ${B}/arch/riscv/dts/x1_orangepi-rv2.dtb ${B}/
-	# u-boot-nodtb.bin also needed for .itb but already in ${B}
-	cp ${S}/uboot-opensbi.its ${B}/
-	cd ${B}
-	mkimage -f uboot-opensbi.its -r u-boot-opensbi.itb
-	install -m 644 u-boot-opensbi.itb ${DEPLOYDIR}/
-}
-
 do_deploy:append:orangepi-r2s() {
 	install -m 644 ${S}/bootinfo_sd.bin ${DEPLOYDIR}/
 	cp ${DEPLOY_DIR_IMAGE}/fw_dynamic.bin ${B}/
@@ -46,4 +34,4 @@ do_deploy:append:orangepi-r2s() {
 }
 do_deploy[depends] += "opensbi:do_deploy"
 
-COMPATIBLE_MACHINE = "(orangepi-rv2|orangepi-r2s)"
+COMPATIBLE_MACHINE = "(orangepi-r2s)"

recipes-kernel/linux/linux-orangepi.bb

@@ -11,7 +11,6 @@ BRANCH:k1 = "orange-pi-6.6-ky"
 SRCREV:k1 = "ae9e974d3e19f460b6397bfe8f0f1417a073ce05"
 
 LINUX_VERSION:k1 = "6.6.63"
-LINUX_VERSION_EXTENSION:append:orangepi-rv2 = "-orangepi-rv2"
 LINUX_VERSION_EXTENSION:append:orangepi-r2s = "-orangepi-r2s"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"