rename config.txt to diya-config.txt

recipes-bsp/u-boot/files/boot.cmd

@@ -18,8 +18,8 @@ itest.b *0x10028 == 0x03 && echo "U-boot loaded from SPI"
 
 echo "Boot script loaded from ${devtype}"
 
-if test -e ${devtype} ${devnum} config.txt; then
-	load ${devtype} ${devnum} ${load_addr} config.txt
+if test -e ${devtype} ${devnum} diya-config.txt; then
+	load ${devtype} ${devnum} ${load_addr} diya-config.txt
 	env import -t ${load_addr} ${filesize}
 fi
 

recipes-core/base-files/base-files_%.bbappend

@@ -1,7 +1,10 @@
 hostname = "diya"
 
 do_install:append () {
-cat << EOF >> "${D}${sysconfdir}/modules"
+    cat << 'EOF' >> "${D}${sysconfdir}/profile"
+export DISK="mmcblk1"
+EOF
+    cat << EOF >> "${D}${sysconfdir}/modules"
 uwe5622_bsp_sdio
 sprdwl_ng
 sprdbt_tty

recipes-core/images/core-image-base.bbappend

@@ -0,0 +1,2 @@
+IMAGE_BOOT_FILES:append:orange-pi-zero2w = " boot.scr ${KERNEL_DEVICETREE} allwinner/overlay/sun50i-h616-fixup.scr "
+IMAGE_INSTALL:append:orange-pi-zero2w = " uwe5622-firmware "

recipes-core/images/core-image-minimal.bbappend

@@ -1,2 +0,0 @@
-IMAGE_BOOT_FILES:append = " boot.scr ${KERNEL_DEVICETREE} allwinner/overlay/sun50i-h616-fixup.scr "
-IMAGE_INSTALL:append = " uwe5622-firmware "

recipes-core/images/core-image-recovery.bbapend

@@ -0,0 +1,7 @@
+image_patch:append () {
+    # create /etc/fstab
+    cat << EOF > ${IMAGE_ROOTFS}/etc/fstab
+/dev/mmcblk1p1       /boot          auto       defaults  0  0
+/dev/mmcblk1p4       /home          auto       defaults  0  0
+EOF
+}

recipes-graphics/mesa/mesa-gl_%.bbappend

@@ -1 +0,0 @@
-PACKAGECONFIG:class-target = "opengl gallium"

recipes-graphics/mesa/mesa_%.bbappend

@@ -1,5 +1,2 @@
 # Enable lima and panfrost Mesa drivers
 PACKAGECONFIG:append = " lima panfrost"
-# Enable KMS renderonly Mesa support
-# See https://cgit.freedesktop.org/mesa/mesa/commit/?id=2b780fe89300199f2334539aa1678e9b68f0434f
-GALLIUMDRIVERS:append = ",kmsro"

wic/image.wks.in

@@ -0,0 +1,12 @@
+# short-description: Create Raspberry Pi SD card image
+# long-description: Creates a partitioned SD card image for use with
+
+part u-boot --source rawcopy --sourceparams="file=${SPL_BINARY}" --ondisk mmcblk1 --no-table --align 8
+part /boot --source bootimg-partition --ondisk mmcblk1 --fstype=vfat --label boot --active --align 4096 --size 32
+# read only roofs
+part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label root --align 4096 --size 150 --exclude-path home/ --exclude-path var/etc/ --exclude-path boot/
+# modifiable configurations stored in /var/etc
+part /var/etc --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var/etc --ondisk mmcblk1 --fstype=ext4 --label diya --align 1024 --size 32
+# home partition
+part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --ondisk mmcblk1 --fstype=ext4 --label home --align 1024 --size 16
+# part /home --ondisk mmcblk1 --fstype=vfat --label music --active --align 1024 --size 16