resolved conflicts for merge of 1b748051
to lmp-mr1-ub-dev
This commit is contained in:
@@ -1217,7 +1217,8 @@ PARTITION_TYPES = {
|
|||||||
"mtd": "MTD",
|
"mtd": "MTD",
|
||||||
"ext4": "EMMC",
|
"ext4": "EMMC",
|
||||||
"emmc": "EMMC",
|
"emmc": "EMMC",
|
||||||
"f2fs": "EMMC"
|
"f2fs": "EMMC",
|
||||||
|
"squashfs": "EMMC"
|
||||||
}
|
}
|
||||||
|
|
||||||
def GetTypeAndDevice(mount_point, info):
|
def GetTypeAndDevice(mount_point, info):
|
||||||
|
Reference in New Issue
Block a user