From 410eb151a9ee7b87037585a7215ecdfb6425dc9a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 23 Feb 2024 12:56:31 +0100 Subject: [PATCH] webos-raspberrypi: Use WKS from upstream again :Release Notes: /boot minimal size was increased from 20MB to 100MB in: https://github.com/agherzan/meta-raspberrypi/pull/1290 https://github.com/agherzan/meta-raspberrypi/commit/95a9103f914c3e2665a1ffe7f70533c44cb4f3af so this (increase from minimal 20MB to fixed 80MB) is no longer needed. :Detailed Notes: Revert "meta-webos-raspberrypi: fix boot image partition size" This reverts commit 2a33e0d337071288fdd6d14881335de5ee6e5429. :Testing Performed: build and runtime tested. See the CCC ticket :QA Notes: :Issues Addressed: [WRP-25796] CCC: meta-webos-raspberrypi: fix boot image partition size [WRP-24777] [OSE-RPi4]:RPI-Device is not Rebooted , getting error as "Update fail". [WRP-29491] Create GPVB with Yocto 5.0 Scarthgap Change-Id: I2a8fb5646f4bc46e997be21ca866e74a36241dc2 --- meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc | 3 --- meta-webos-raspberrypi/wic/sdimage-raspberrypi-webos.wks | 6 ------ 2 files changed, 9 deletions(-) delete mode 100644 meta-webos-raspberrypi/wic/sdimage-raspberrypi-webos.wks diff --git a/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc b/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc index 6ee7e3679..f9ee385f6 100644 --- a/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc +++ b/meta-webos-raspberrypi/conf/machine/include/webos-rpi.inc @@ -102,8 +102,5 @@ WEBOS_BLUETOOTH_ENABLED_SERVICE_CLASSES = "SPP GATT FTP OPP A2DP" SDIMG_ROOTFS_TYPE = "ext4" IMAGE_FSTYPES:remove = "ext3" -# fixed size boot image -WKS_FILE = "sdimage-raspberrypi-webos.wks" - # Use Fake KMS until surface-manager is fixed to support Full KMS, see WRP-5 VC4DTBO = "vc4-fkms-v3d" diff --git a/meta-webos-raspberrypi/wic/sdimage-raspberrypi-webos.wks b/meta-webos-raspberrypi/wic/sdimage-raspberrypi-webos.wks deleted file mode 100644 index 451f1df2c..000000000 --- a/meta-webos-raspberrypi/wic/sdimage-raspberrypi-webos.wks +++ /dev/null @@ -1,6 +0,0 @@ -# short-description: Create Raspberry Pi SD card image -# long-description: Creates a partitioned SD card image for use with -# Raspberry Pi. Boot files are located in the first vfat partition. - -part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 80M -part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096