Merge pull request #855 from YoeDistro/kraj/master

Add yoe updater support for visionfive2 board
YoeDistro · Oct 14, 2023 · 562dc28 · 562dc28
2 parents cd005e9 + 47fa1e0
commit 562dc28
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,11 +26,14 @@ and this project adheres to
 - Upgrade linux-yocto recipes to v6.1.57, v6.5.7
 - Upgrade go compiler to 1.20.10
 - Upgrade curl to 8.4.0
+- Fix ptests for python3-py-cpuinfo and python3-pytest-mock
+- Add ptest for libtext-diff-perl
 
 ### Added
 
-- Added recipes - tayga, ttyrun
+- Added recipes - tayga, ttyrun, python3-arrow, python-git-pw
 - Add bblock feature to core
+- Add  Yoe updater support for VisionFive2 board
 
 ### Removed
 

diff --git a/conf/projects/visionfive2/config.conf b/conf/projects/visionfive2/config.conf
@@ -13,6 +13,9 @@ IMAGE_FSTYPES:append = " wic.xz wic.bmap ext4.xz"
 WKS_FILE:yoe = "yoe-visionfive2-sdimage.wks"
 # Use yoe-initramfs-image for initramfs
 INITRAMFS_IMAGE = "yoe-initramfs-image"
+# Use kernel+initramfs image to boot
+IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}"
+IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE};${KERNEL_IMAGETYPE}"
 
 # Needed for Running bitbake -ctestimage <image>
 TEST_TARGET_IP = "10.0.0.86"

diff --git a/sources/meta-arm b/sources/meta-arm
diff --git a/sources/meta-openembedded b/sources/meta-openembedded
diff --git a/sources/meta-yoe/recipes-core/images/machines/visionfive2.inc b/sources/meta-yoe/recipes-core/images/machines/visionfive2.inc
@@ -1,7 +1,7 @@
 # We use updater to handle disk/SD management, therefore remove 96boards-tools
 IMAGE_INSTALL:remove = "96boards-tools"
 
-KERNEL_IMAGE = "${KERNEL_IMAGETYPE}"
+KERNEL_IMAGE = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
 
 KERNEL_ARTEFACTS = "\
     ${KERNEL_IMAGETYPE} \

diff --git a/sources/meta-yoe/recipes-support/updater/files/updater.installer b/sources/meta-yoe/recipes-support/updater/files/updater.installer
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=21.3
+VERSION=21.4
 
 . ./platform
 
@@ -115,22 +115,32 @@ initialize() {
   mkdir -p $DATA_MOUNT_POINT
 }
 
+# Pass device,partition e.g. $EMMC_DEVICE $EMMC_DATA_DEV
+# Default is SD device if nothing is passed
 resize_sd() {
-  echo "Checking data partition size ..." || return 1
   if [ -z "$1" ]; then
     DEVICE=$SD_DEVICE
+    PART=$SD_DATA_DEV
   else
     DEVICE=$1
+    if [ -z "$2"]; then
+      echo "Please specify partition to resize e.g. /dev/mmcblk0p3" || return 1
+      return 0
+    fi
+    PART=$2
   fi
-  DEVICE_NAME=$(basename ${DEVICE})
-  PART_SIZE=$(cat "/sys/class/block/${DEVICE_NAME}p3/size")
+  PART_NAME=$(basename ${PART})
+  PART_SIZE=$(cat "/sys/class/block/${PART_NAME}/size")
+  PART_NUM=$(cat "/sys/class/block/${PART_NAME}/partition")
   # only continue if partition size is 1MB
+  echo "Checking data partition size ..." || return 1
   if [ $PART_SIZE -gt 2048 ]; then
     return 0
   fi
   echo "Resizing data partition ..." || return 1
-  echo "- +" | sfdisk -N 3 ${DEVICE}
-  resize2fs ${DEVICE}p3
+  echo "- +" | sfdisk -N ${PART_NUM} ${DEVICE}
+  e2fsck -fy ${PART}
+  resize2fs ${PART}
 }
 
 partition_sd() {
@@ -219,7 +229,7 @@ partition_emmc() {
 }
 
 resize_emmc() {
-  resize_sd $EMMC_DEVICE
+  resize_sd $EMMC_DEVICE $EMMC_DATA_DEV
 }
 
 format_emmc_boot() {

diff --git a/sources/meta-yoe/recipes-support/updater/files/visionfive2/platform b/sources/meta-yoe/recipes-support/updater/files/visionfive2/platform
@@ -67,8 +67,9 @@ MOUNT_BOOT=1
 
 plat_init() {
   msg "Running $PLAT initializations ..."
-  cat /proc/cpuinfo | grep uarch | cut -d' ' -f 2 | head -1 > /etc/hwrevision
+  cat /proc/cpuinfo | grep uarch | cut -d' ' -f 2 | head -n1 > /etc/hwrevision
 }
 
 plat_bootloader_quirks() {
+  :
 }