Merge pull request #44 from sriedmueller/main

Fix imx8mp alias imx865 support
bootlin · Aug 2, 2024 · 8bfbb88 · 8bfbb88
2 parents 4dd5cd5 + 85184f4
commit 8bfbb88
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/snagrecover/firmware/rom_container.py b/src/snagrecover/firmware/rom_container.py
@@ -63,7 +63,7 @@ def get_container_size(boot_blob: bytes) -> int:
 	container for boards socs using the SDPS protocol.
 	"""
 	soc_model = recovery_config["soc_model"]
-	if soc_model in ["imx815","imx93"]:
+	if soc_model in ["imx815", "imx865", "imx93"]:
 		return len(boot_blob)
 	rom_container_tag = boot_blob[CONTAINER_HDR_ALIGNMENT + 3]
 	if rom_container_tag != CONTAINER_TAG:

diff --git a/src/snagrecover/protocols/imx_sdp.py b/src/snagrecover/protocols/imx_sdp.py
@@ -327,7 +327,7 @@ def sdps_write(self, blob: bytes, size: int) -> bool:
 		"""
 		logger.info(f"SDPS write with parameters size:0x{size:x} offset:0x00")
 		soc_model = recovery_config["soc_model"]
-		if soc_model not in ["imx8qm", "imx8qxp","imx815","imx93"]:
+		if soc_model not in ["imx8qm", "imx8qxp", "imx815", "imx865", "imx93"]:
 			# only some mpu models require a preliminary command before the report 2
 			# transfer
 			packet1_arr = bytearray(b"\x01") # report 1
@@ -341,7 +341,7 @@ def sdps_write(self, blob: bytes, size: int) -> bool:
 			packet1_arr += b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" # reserved
 			packet1 = bytes(packet1_arr)
 			self.dev.write(packet1)
-		if soc_model in ["imx815","imx93"]:
+		if soc_model in ["imx815", "imx865", "imx93"]:
 			transfer_size = 1020
 		else:
 			transfer_size = 1024

diff --git a/src/snagrecover/supported_socs.yaml b/src/snagrecover/supported_socs.yaml
@@ -25,6 +25,8 @@ tested:
         family: imx
   imx7d:
         family: imx
+  imx865:
+        family: imx
   imx8mm:
         family: imx
   imx8qm:
@@ -98,8 +100,6 @@ untested:
         family: imx
   imx815:
         family: imx
-  imx865:
-        family: imx
   imx8dxl:
         family: imx
   imx8mq:

diff --git a/src/snagrecover/templates/imx8mp-phyboard-pollux.yaml b/src/snagrecover/templates/imx8mp-phyboard-pollux.yaml
@@ -0,0 +1,2 @@
+flash-bin:
+  path: imx-boot