From a3518d886634cc91cc1ec784ca1701c254ac1400 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Thu, 28 Nov 2024 21:31:57 +0000 Subject: [PATCH] Switch rootfs partition label and image name from system to rootfs 'system' as rootfs partition label and image name is a definition that comes from the Android world, switch to 'rootfs' which is more standard in general embedded linux terminology. Signed-off-by: Ricardo Salveti --- classes-recipe/image_types_qcom.bbclass | 2 +- conf/machine/include/qcom-base.inc | 2 +- .../partition/qcom-partition-confs/qcm6490-partitions.conf | 2 +- .../partition/qcom-partition-confs/qcs9100-partitions.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes-recipe/image_types_qcom.bbclass b/classes-recipe/image_types_qcom.bbclass index d6540efd..86229287 100644 --- a/classes-recipe/image_types_qcom.bbclass +++ b/classes-recipe/image_types_qcom.bbclass @@ -15,7 +15,7 @@ QCOM_ESP_FILE ?= "${@'efi.bin' if d.getVar('QCOM_ESP_IMAGE') else ''}" QCOM_DTB_DEFAULT ?= "${@os.path.basename(d.getVar('KERNEL_DEVICETREE').split()[0][:-4]) if d.getVar('KERNEL_DEVICETREE') else ''}" QCOM_DTB_FILE ?= "dtb.bin" -QCOM_ROOTFS_FILE ?= "system.img" +QCOM_ROOTFS_FILE ?= "rootfs.img" IMAGE_QCOMFLASH_FS_TYPE ??= "ext4" QCOMFLASH_DIR = "${WORKDIR}/qcomflash" diff --git a/conf/machine/include/qcom-base.inc b/conf/machine/include/qcom-base.inc index f8e0ee78..ea4cfe8f 100644 --- a/conf/machine/include/qcom-base.inc +++ b/conf/machine/include/qcom-base.inc @@ -16,5 +16,5 @@ EXTRA_IMAGECMD:ext4 = "-i 4096 -b 4096" SERIAL_CONSOLES ?= "115200;ttyMSM0" -QCOM_BOOTIMG_ROOTFS ?= "PARTLABEL=system" +QCOM_BOOTIMG_ROOTFS ?= "PARTLABEL=rootfs" diff --git a/recipes-bsp/partition/qcom-partition-confs/qcm6490-partitions.conf b/recipes-bsp/partition/qcom-partition-confs/qcm6490-partitions.conf index 04e1f467..a19e8091 100644 --- a/recipes-bsp/partition/qcom-partition-confs/qcm6490-partitions.conf +++ b/recipes-bsp/partition/qcom-partition-confs/qcm6490-partitions.conf @@ -20,7 +20,7 @@ #This is LUN 0 - HLOS LUN --partition --lun=0 --name=efi --size=524288KB --type-guid=C12A7328-F81F-11D2-BA4B-00A0C93EC93B --filename=efi.bin ---partition --lun=0 --name=system --size=23099392KB --type-guid=B921B045-1DF0-41C3-AF44-4C6F280D3FAE --filename=system.img +--partition --lun=0 --name=rootfs --size=23099392KB --type-guid=B921B045-1DF0-41C3-AF44-4C6F280D3FAE --filename=rootfs.img #This is LUN 1 - Boot LUN A --partition --lun=1 --name=xbl_a --size=3604KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98 --filename=xbl.elf diff --git a/recipes-bsp/partition/qcom-partition-confs/qcs9100-partitions.conf b/recipes-bsp/partition/qcom-partition-confs/qcs9100-partitions.conf index 2f72a1e3..cf418cd4 100644 --- a/recipes-bsp/partition/qcom-partition-confs/qcs9100-partitions.conf +++ b/recipes-bsp/partition/qcom-partition-confs/qcs9100-partitions.conf @@ -24,7 +24,7 @@ --partition --lun=0 --name=reserved1_a --size=65536KB --type-guid=4ef7c492-d028-41c6-b47a-bbd33850cb31 --partition --lun=0 --name=reserved2_a --size=65536KB --type-guid=4e351956-aa2a-479e-b5f7-163da39f14f6 --partition --lun=0 --name=efi --size=524288KB --type-guid=c12a7328-f81f-11d2-ba4b-00a0c93ec93b --filename=efi.bin ---partition --lun=0 --name=system --size=29390848KB --type-guid=b921b045-1df0-41c3-af44-4c6f280d3fae --filename=system.img +--partition --lun=0 --name=rootfs --size=29390848KB --type-guid=b921b045-1df0-41c3-af44-4c6f280d3fae --filename=rootfs.img # This is LUN 1 - Boot LUN A --partition --lun=1 --name=xbl_a --size=5120KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98 --filename=xbl.elf