diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index 1e05860f..8f219d5b 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -274,7 +274,6 @@ deviceinfo_attributes = [ "flash_offset_tags", "flash_pagesize", "flash_fastboot_max_size", - "flash_fastboot_vendor_id", "flash_sparse", "rootfs_image_sector_size", "sd_embed_firmware", @@ -339,7 +338,7 @@ $IMAGE: Path to the rootfs image $PARTITION_KERNEL: Partition to flash the kernel/boot.img to $PARTITION_SYSTEM: Partition to flash the rootfs to -Fastboot specific: $KERNEL_CMDLINE, $VENDOR_ID +Fastboot specific: $KERNEL_CMDLINE Heimdall specific: $PARTITION_INITFS uuu specific: $UUU_SCRIPT """ @@ -348,14 +347,12 @@ flashers = { "depends": ["android-tools"], "actions": { - "list_devices": [["fastboot", "-i", "$VENDOR_ID", - "devices", "-l"]], - "flash_rootfs": [["fastboot", "-i", "$VENDOR_ID", - "flash", "$PARTITION_SYSTEM", "$IMAGE"]], - "flash_kernel": [["fastboot", "-i", "$VENDOR_ID", - "flash", "$PARTITION_KERNEL", "$BOOT/boot.img-$FLAVOR"]], - "boot": [["fastboot", "-i", "$VENDOR_ID", - "-c", "$KERNEL_CMDLINE", "boot", + "list_devices": [["fastboot", "devices", "-l"]], + "flash_rootfs": [["fastboot", "flash", "$PARTITION_SYSTEM", + "$IMAGE"]], + "flash_kernel": [["fastboot", "flash", "$PARTITION_KERNEL", + "$BOOT/boot.img-$FLAVOR"]], + "boot": [["fastboot", "-c", "$KERNEL_CMDLINE", "boot", "$BOOT/boot.img-$FLAVOR"]], }, }, diff --git a/pmb/flasher/run.py b/pmb/flasher/run.py index ce49e1a5..dd86e656 100644 --- a/pmb/flasher/run.py +++ b/pmb/flasher/run.py @@ -54,7 +54,7 @@ def run(args, action, flavor=None): for key, value in vars.items(): for i in range(len(command)): if key in command[i]: - if not value and key not in ["$KERNEL_CMDLINE", "$VENDOR_ID"]: + if not value and key != "$KERNEL_CMDLINE": raise RuntimeError("Variable " + key + " found in" " action " + action + " for method " + method + "," " but the value for this variable is None! Is that" diff --git a/pmb/flasher/variables.py b/pmb/flasher/variables.py index a49e88db..a99ca768 100644 --- a/pmb/flasher/variables.py +++ b/pmb/flasher/variables.py @@ -39,7 +39,6 @@ def variables(args, flavor, method): "$BOOT": "/mnt/rootfs_" + args.device + "/boot", "$FLAVOR": flavor if flavor is not None else "", "$IMAGE": "/home/pmos/rootfs/" + args.device + ".img", - "$VENDOR_ID": args.deviceinfo["flash_fastboot_vendor_id"], "$KERNEL_CMDLINE": _cmdline, "$PARTITION_KERNEL": _partition_kernel, "$PARTITION_INITFS": args.deviceinfo["flash_heimdall_partition_initfs"] or "RECOVERY",