From: Karol Lewandowski Date: Fri, 7 Jun 2024 06:12:14 +0000 (+0200) Subject: sd_fusing: Drop most "fstype" definitions X-Git-Tag: accepted/tizen/unified/20240614.085106~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67b027813f68a33cfba07756f3c86e95552c1192;p=platform%2Fkernel%2Fu-boot.git sd_fusing: Drop most "fstype" definitions This commit drops most "fstype" from target classes as its definition forces creating new filesystem using mkfs., which is normally not needed as the partitions are overwriten by flashed binaries. Additionally, this commit also drops fstype checking from partition table verfication as it became useless. Change-Id: Ief2034f0a1452ab48bd3f2b54b07a709126b000e --- diff --git a/scripts/tizen/sd_fusing.py b/scripts/tizen/sd_fusing.py index 8b63766d43..b875105e3f 100755 --- a/scripts/tizen/sd_fusing.py +++ b/scripts/tizen/sd_fusing.py @@ -185,9 +185,6 @@ class SdFusingTarget: if "PARTLABEL=" in bo and f"PARTLABEL={part['name']}" not in bo: logging.error(f'On-device partition label mismatch with selected target: partlabel={part["name"]}, on-device:\n{bo}') sys.exit(1) - if part['fstype'] not in 'raw' and f"TYPE={part['fstype']}" not in bo: - logging.error(f'On-device partition mismatch with selected target: fstype={part["fstype"]}, on-device:\n{bo}') - sys.exit(1) def initialize_parameters(self): pass @@ -268,25 +265,25 @@ class InitParams: class Rpi3(InitParams, SdFusingTarget): long_name = "Raspberry Pi 3" part_table = [ - {"size": 64, "fstype": "vfat", "name": "boot", "start": 4, "ptype": "0xe", "bootable": True, - "binaries": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs", - "binaries": "rootfs.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, + {"size": 64, "name": "boot", "start": 4, "ptype": "0xe", "bootable": True, + "binaries": "boot.img"}, + {"size": 3072, "name": "rootfs", + "binaries": "rootfs.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, {"size": None, "ptype": "5", "name": "extended", "start": 4484}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "modules", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 256, "fstype": "ext4", "name": "hal", - "binaries": "hal.img"}, - {"size": 125, "fstype": "ext4", "name": "reserved2"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "modules", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 256, "name": "hal", + "binaries": "hal.img"}, + {"size": 125, "name": "reserved2"}, ] def __init__(self, device, args): @@ -297,35 +294,35 @@ class Rpi3(InitParams, SdFusingTarget): class Rpi4Super(InitParams, SdFusingTargetAB): long_name = "Raspberry Pi 4 w/ super partition" part_table = [ - {"size": 64, "fstype": "vfat", "name": "boot_a","start": 4, - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, - {"size": 6657, "fstype": "ext4", "name": "super", - "binaries": "super.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, + {"size": 64, "name": "boot_a","start": 4, + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, + {"size": 6657, "name": "super", + "binaries": "super.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, {"size": 36, "fstype": "raw", "name": "none"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 64, "fstype": "vfat", "name": "boot_b", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 64, "name": "boot_b", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "binaries_b": "boot.img"}, - {"size": 32, "fstype": "ext4", "name": "module_b", + {"size": 32, "name": "module_b", "binaries_b": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_b", + {"size": 32, "name": "ramdisk_b", "binaries_b": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_b", + {"size": 32, "name": "ramdisk-recovery_b", "binaries_b": "ramdisk-recovery.img"}, - {"size": 4, "fstype": "ext4", "name": "reserved0"}, - {"size": 64, "fstype": "ext4", "name": "reserved1"}, - {"size": 125, "fstype": "ext4", "name": "reserved2"} + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"} ] def __init__(self, device, args): @@ -339,41 +336,41 @@ class Rpi4Super(InitParams, SdFusingTargetAB): class Rpi4(InitParams, SdFusingTargetAB): long_name = "Raspberry Pi 4" part_table = [ - {"size": 64, "fstype": "vfat", "name": "boot_a", "start": 4, - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_a", - "binaries": "rootfs.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, - {"size": 36, "fstype": "raw", "name": "none"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 256, "fstype": "ext4", "name": "hal_a", - "binaries": "hal.img"}, - {"size": 64, "fstype": "vfat", "name": "boot_b", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + {"size": 64, "name": "boot_a", "start": 4, + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, + {"size": 3072, "name": "rootfs_a", + "binaries": "rootfs.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, + {"size": 36, "name": "none"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 256, "name": "hal_a", + "binaries": "hal.img"}, + {"size": 64, "name": "boot_b", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "binaries_b": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_b", + {"size": 3072, "name": "rootfs_b", "binaries_b": "rootfs.img"}, - {"size": 32, "fstype": "ext4", "name": "module_b", + {"size": 32, "name": "module_b", "binaries_b": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_b", + {"size": 32, "name": "ramdisk_b", "binaries_b": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_b", + {"size": 32, "name": "ramdisk-recovery_b", "binaries_b": "ramdisk-recovery.img"}, - {"size": 256, "fstype": "ext4", "name": "hal_b", + {"size": 256, "name": "hal_b", "binaries_b": "hal.img"}, - {"size": 4, "fstype": "ext4", "name": "reserved0"}, - {"size": 64, "fstype": "ext4", "name": "reserved1"}, - {"size": 125, "fstype": "ext4", "name": "reserved2"}, + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"}, ] def __init__(self, device, args): @@ -385,49 +382,49 @@ class Rpi4(InitParams, SdFusingTargetAB): class Rpi4AoT(InitParams, SdFusingTargetAB): long_name = "Raspberry Pi 4 for AoT" part_table = [ - {"size": 64, "fstype": "vfat", "name": "boot_a", "start": 4, - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_a", - "binaries": "rootfs.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, - {"size": 36, "fstype": "raw", "name": "none"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 256, "fstype": "ext4", "name": "hal_a", - "binaries": "hal.img"}, - {"size": 64, "fstype": "vfat", "name": "boot_b", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + {"size": 64, "name": "boot_a", "start": 4, + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, + {"size": 3072, "name": "rootfs_a", + "binaries": "rootfs.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, + {"size": 36, "name": "none"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 256, "name": "hal_a", + "binaries": "hal.img"}, + {"size": 64, "name": "boot_b", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "binaries_b": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_b", + {"size": 3072, "name": "rootfs_b", "binaries_b": "rootfs.img"}, - {"size": 32, "fstype": "ext4", "name": "module_b", + {"size": 32, "name": "module_b", "binaries_b": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_b", + {"size": 32, "name": "ramdisk_b", "binaries_b": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_b", + {"size": 32, "name": "ramdisk-recovery_b", "binaries_b": "ramdisk-recovery.img"}, - {"size": 256, "fstype": "ext4", "name": "hal_b", + {"size": 256, "name": "hal_b", "binaries_b": "hal.img"}, - {"size": 1536, "fstype": "ext4", "name": "aot-system_a", - "binaries": "system.img"}, - {"size": 1536, "fstype": "ext4", "name": "aot-system_b", + {"size": 1536, "name": "aot-system_a", + "binaries": "system.img"}, + {"size": 1536, "name": "aot-system_b", "binaries_b": "system.img"}, - {"size": 256, "fstype": "ext4", "name": "aot-vendor_a", - "binaries": "vendor.img"}, - {"size": 256, "fstype": "ext4", "name": "aot-vendor_b", + {"size": 256, "name": "aot-vendor_a", + "binaries": "vendor.img"}, + {"size": 256, "name": "aot-vendor_b", "binaries_b": "vendor.img"}, - {"size": 4, "fstype": "ext4", "name": "reserved0"}, - {"size": 64, "fstype": "ext4", "name": "reserved1"}, - {"size": 125, "fstype": "ext4", "name": "reserved2"}, + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"}, ] def __init__(self, device, args): @@ -439,34 +436,34 @@ class Rpi4AoT(InitParams, SdFusingTargetAB): class RV64(InitParams, SdFusingTarget): long_name = "QEMU RISC-V 64-bit" part_table = [ - {"size": 2, "fstype": "raw", "name": "SPL", "start": 4, - "ptype": "2E54B353-1271-4842-806F-E436D6AF6985", - "binaries": ""}, - {"size": 4, "fstype": "raw", "name": "u-boot", - "ptype": "5B193300-FC78-40CD-8002-E86C45580B47", - "binaries": ["u-boot.img", "u-boot.itb"],}, - {"size": 292, "fstype": "vfat", "name": "boot_a", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, - {"size": 36, "fstype": "raw", "name": "none"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_a", - "binaries": "rootfs.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 256, "fstype": "ext4", "name": "hal_a", - "binaries": "hal.img"}, - {"size": 4, "fstype": "raw", "name": "reserved0"}, - {"size": 64, "fstype": "raw", "name": "reserved1"}, - {"size": 125, "fstype": "raw", "name": "reserved2"}, + {"size": 2, "name": "SPL", "start": 4, + "ptype": "2E54B353-1271-4842-806F-E436D6AF6985", + "binaries": ""}, + {"size": 4, "name": "u-boot", + "ptype": "5B193300-FC78-40CD-8002-E86C45580B47", + "binaries": ["u-boot.img", "u-boot.itb"],}, + {"size": 292, "name": "boot_a", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, + {"size": 36, "name": "none"}, + {"size": 3072, "name": "rootfs_a", + "binaries": "rootfs.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 256, "name": "hal_a", + "binaries": "hal.img"}, + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"}, ] def __init__(self, device, args): @@ -478,47 +475,47 @@ class RV64(InitParams, SdFusingTarget): class VF2(InitParams, SdFusingTargetAB): long_name = "VisionFive2" part_table = [ - {"size": 2, "fstype": "raw", "name": "SPL", "start": 4, - "ptype": "2E54B353-1271-4842-806F-E436D6AF6985", - "binaries": ["u-boot-spl.bin.normal.out"],}, - {"size": 4, "fstype": "raw", "name": "u-boot", - "ptype": "5B193300-FC78-40CD-8002-E86C45580B47", - "binaries": ["u-boot.img", "u-boot.itb"],}, - {"size": 128, "fstype": "vfat", "name": "boot_a", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, - {"size": 36, "fstype": "raw", "name": "none"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_a", - "binaries": "rootfs.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 256, "fstype": "ext4", "name": "hal_a", - "binaries": "hal.img"}, - {"size": 128, "fstype": "vfat", "name": "boot_b", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + {"size": 2, "name": "SPL", "start": 4, + "ptype": "2E54B353-1271-4842-806F-E436D6AF6985", + "binaries": ["u-boot-spl.bin.normal.out"],}, + {"size": 4, "name": "u-boot", + "ptype": "5B193300-FC78-40CD-8002-E86C45580B47", + "binaries": ["u-boot.img", "u-boot.itb"],}, + {"size": 128, "name": "boot_a", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, + {"size": 36, "name": "none"}, + {"size": 3072, "name": "rootfs_a", + "binaries": "rootfs.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 256, "name": "hal_a", + "binaries": "hal.img"}, + {"size": 128, "name": "boot_b", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "binaries_b": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_b", + {"size": 3072, "name": "rootfs_b", "binaries_b": "rootfs.img"}, - {"size": 32, "fstype": "ext4", "name": "module_b", + {"size": 32, "name": "module_b", "binaries_b": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_b", + {"size": 32, "name": "ramdisk_b", "binaries_b": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_b", + {"size": 32, "name": "ramdisk-recovery_b", "binaries_b": "ramdisk-recovery.img"}, - {"size": 256, "fstype": "ext4", "name": "hal_b", + {"size": 256, "name": "hal_b", "binaries_b": "hal.img"}, - {"size": 4, "fstype": "raw", "name": "reserved0"}, - {"size": 64, "fstype": "raw", "name": "reserved1"}, - {"size": 125, "fstype": "raw", "name": "reserved2"}, + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"}, ] def __init__(self, device, args): @@ -531,41 +528,41 @@ class VF2(InitParams, SdFusingTargetAB): class VF2Super(InitParams, SdFusingTargetAB): long_name = "VisionFive2 w/ super partition" part_table = [ - {"size": 2, "fstype": "raw", "name": "SPL", "start": 4, - "ptype": "2E54B353-1271-4842-806F-E436D6AF6985", - "binaries": ["u-boot-spl.bin.normal.out"],}, - {"size": 4, "fstype": "raw", "name": "u-boot", - "ptype": "5B193300-FC78-40CD-8002-E86C45580B47", - "binaries": ["u-boot.img", "u-boot.itb"],}, - {"size": 128, "fstype": "vfat", "name": "boot_a", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, + {"size": 2, "name": "SPL", "start": 4, + "ptype": "2E54B353-1271-4842-806F-E436D6AF6985", + "binaries": ["u-boot-spl.bin.normal.out"],}, + {"size": 4, "name": "u-boot", + "ptype": "5B193300-FC78-40CD-8002-E86C45580B47", + "binaries": ["u-boot.img", "u-boot.itb"],}, + {"size": 128, "name": "boot_a", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, {"size": 36, "fstype": "raw", "name": "none"}, - {"size": 6656, "fstype": "ext4", "name": "super", - "binaries": "super.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 128, "fstype": "vfat", "name": "boot_b", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + {"size": 6656, "name": "super", + "binaries": "super.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 128, "name": "boot_b", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "binaries_b": "boot.img"}, - {"size": 32, "fstype": "ext4", "name": "module_b", + {"size": 32, "name": "module_b", "binaries_b": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_b", + {"size": 32, "name": "ramdisk_b", "binaries_b": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_b", + {"size": 32, "name": "ramdisk-recovery_b", "binaries_b": "ramdisk-recovery.img"}, - {"size": 4, "fstype": "raw", "name": "reserved0"}, - {"size": 64, "fstype": "raw", "name": "reserved1"}, - {"size": 125, "fstype": "raw", "name": "reserved2"}, + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"}, ] def __init__(self, device, args): @@ -579,44 +576,44 @@ class VF2Super(InitParams, SdFusingTargetAB): class LicheePi4A(InitParams, SdFusingTargetAB): long_name = "LicheePi4A" part_table = [ - {"size": None, "fstype": "raw", "name": "spl+uboot", + {"size": None, "name": "spl+uboot", "start_sector": 34, "size_sectors": 4062, - "ptype": "8DA63339-0007-60C0-C436-083AC8230908", - "binaries": ["u-boot-with-spl.bin"],}, - {"size": 128, "fstype": "vfat", "name": "boot_a", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_a", - "binaries": "rootfs.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 256, "fstype": "ext4", "name": "hal_a", - "binaries": "hal.img"}, - {"size": 128, "fstype": "vfat", "name": "boot_b", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "ptype": "8DA63339-0007-60C0-C436-083AC8230908", + "binaries": ["u-boot-with-spl.bin"],}, + {"size": 128, "name": "boot_a", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, + {"size": 3072, "name": "rootfs_a", + "binaries": "rootfs.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 256, "name": "hal_a", + "binaries": "hal.img"}, + {"size": 128, "name": "boot_b", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "binaries_b": "boot.img"}, - {"size": 3072, "fstype": "ext4", "name": "rootfs_b", + {"size": 3072, "name": "rootfs_b", "binaries_b": "rootfs.img"}, - {"size": 32, "fstype": "ext4", "name": "module_b", + {"size": 32, "name": "module_b", "binaries_b": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_b", + {"size": 32, "name": "ramdisk_b", "binaries_b": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_b", + {"size": 32, "name": "ramdisk-recovery_b", "binaries_b": "ramdisk-recovery.img"}, - {"size": 256, "fstype": "ext4", "name": "hal_b", + {"size": 256, "name": "hal_b", "binaries_b": "hal.img"}, - {"size": 4, "fstype": "raw", "name": "reserved0"}, - {"size": 64, "fstype": "raw", "name": "reserved1"}, - {"size": 125, "fstype": "raw", "name": "reserved2"}, + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"}, ] # bootcode written to the protective MBR, aka RV64 'J 0x4400' (sector 34) @@ -632,38 +629,38 @@ class LicheePi4A(InitParams, SdFusingTargetAB): class LicheePi4ASuper(InitParams, SdFusingTargetAB): long_name = "LicheePi4A w/ super partition" part_table = [ - {"size": None, "fstype": "raw", "name": "spl+uboot", + {"size": None, "name": "spl+uboot", "start_sector": 34, "size_sectors": 4062, - "ptype": "8DA63339-0007-60C0-C436-083AC8230908", - "binaries": ["u-boot-with-spl.bin"],}, - {"size": 128, "fstype": "vfat", "name": "boot_a", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": "boot.img"}, - {"size": 6656, "fstype": "ext4", "name": "super", - "binaries": "super.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "system-data.img"}, - {"size": None, "fstype": "f2fs", "name": "user", - "binaries": "user.img"}, - {"size": 32, "fstype": "ext4", "name": "module_a", - "binaries": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_a", - "binaries": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_a", - "binaries": "ramdisk-recovery.img"}, - {"size": 8, "fstype": "ext4", "name": "inform"}, - {"size": 128, "fstype": "vfat", "name": "boot_b", - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "ptype": "8DA63339-0007-60C0-C436-083AC8230908", + "binaries": ["u-boot-with-spl.bin"],}, + {"size": 128, "name": "boot_a", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "boot.img"}, + {"size": 6656, "name": "super", + "binaries": "super.img"}, + {"size": 1344, "name": "system-data", + "binaries": "system-data.img"}, + {"size": None, "name": "user", + "binaries": "user.img"}, + {"size": 32, "name": "module_a", + "binaries": "modules.img"}, + {"size": 32, "name": "ramdisk_a", + "binaries": "ramdisk.img"}, + {"size": 32, "name": "ramdisk-recovery_a", + "binaries": "ramdisk-recovery.img"}, + {"size": 8, "name": "inform", "fstype": "ext4"}, + {"size": 128, "name": "boot_b", + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "binaries_b": "boot.img"}, - {"size": 32, "fstype": "ext4", "name": "module_b", + {"size": 32, "name": "module_b", "binaries_b": "modules.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk_b", + {"size": 32, "name": "ramdisk_b", "binaries_b": "ramdisk.img"}, - {"size": 32, "fstype": "ext4", "name": "ramdisk-recovery_b", + {"size": 32, "name": "ramdisk-recovery_b", "binaries_b": "ramdisk-recovery.img"}, - {"size": 4, "fstype": "ext4", "name": "reserved0"}, - {"size": 64, "fstype": "ext4", "name": "reserved1"}, - {"size": 125, "fstype": "ext4", "name": "reserved2"} + {"size": 4, "name": "reserved0"}, + {"size": 64, "name": "reserved1"}, + {"size": 125, "name": "reserved2"} ] # bootcode written to the protective MBR, aka RV64 'J 0x4400' (sector 34) @@ -680,17 +677,17 @@ class LicheePi4ASuper(InitParams, SdFusingTargetAB): class X86emu(SdFusingTarget): part_table = [ - {"size": 512, "fstype": "vfat", "name": "EFI", "start": 4, - "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", - "binaries": ""}, - {"size": 512, "fstype": "ext2", "name": "boot", - "binaries": "emulator-boot.img",}, - {"size": 2048, "fstype": "ext4", "name": "rootfs", - "binaries": "emulator-rootfs.img"}, - {"size": 1344, "fstype": "ext4", "name": "system-data", - "binaries": "emulator-sysdata.img"}, - {"size": 1024, "fstype": "swap", "name": "emulator-swap", - "ptype": "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F"}, + {"size": 512, "fstype": "vfat", "name": "EFI", "start": 4, + "ptype": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "binaries": "",}, + {"size": 512, "name": "boot", + "binaries": "emulator-boot.img",}, + {"size": 2048, "fstype": "ext4", "name": "rootfs", + "binaries": "emulator-rootfs.img"}, + {"size": 1344, "name": "system-data", + "binaries": "emulator-sysdata.img"}, + {"size": 1024, "name": "emulator-swap", + "ptype": "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F"}, ] def __init__(self, device, args):