libs/flash_image: allow for flashing on AMD via -x flag

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>

Author: macpijan

osfv_cli/pyproject.toml

@@ -10,7 +10,7 @@ robotframework = "^7.2"
 
 [tool.poetry]
 name = "osfv"
-version = "0.7.2"
+version = "0.7.3"
 description = "Open Source Firmware Validation Command Line Interface Tool"
 authors = ["Maciej Pijanowski <Maciej.Pijanowski@3mdeb.com>"]
 include = ["src/models/*.yml"]

osfv_cli/src/osfv/cli/cli.py

@@ -677,10 +677,10 @@ def flash_write(rte, args):
         == False
     ):
         exit(
-            "FATAL: Some image's regions are empty, despite being defined in the flash descriptor. "
-            "Flashing full image in this form will result in a bricked platform. "
-            "If you wish to continue anyway, pass the -x option to skip the check. "
-            "You probably also want to pass the -b option to flash BIOS region only, "
+            "FATAL: Image could not be loaded, or some image's regions are empty, despite being defined in the flash descriptor. "
+            "Flashing full image in this form on Intel platform will result in a bricked platform. "
+            "If you wish to continue anyway (e.g. when using AMD platform), pass the -x option to skip the check. "
+            "When using Intel platform, you probably also want to pass the -b option to flash BIOS region only, "
             "leaving other regions in platform's flash (such as ME) intact."
         )
     print(f"Writing {args.rom} to flash...")

osfv_cli/src/osfv/libs/flash_image.py

@@ -60,8 +60,9 @@ def __init__(self):
 
     def load_image_file(self, image_path):
         if not os.path.isfile(image_path):
-            print(f"FATAL: file does not exist: {image_path}")
-            sys.exit(1)
+            print(f"File does not exist: {image_path}")
+            self.EXIT_CODE = False
+            return False
         with open(
             image_path,
             mode="rb",
@@ -76,8 +77,9 @@ def load_image_file(self, image_path):
                     self.imageData[valsig_offset : (valsig_offset + 0x04)],
                 )[0x00]
                 if valsig != self.FLVALSIG:
-                    print("FATAL: Invalid image, no FLVALSIG found!")
-                    sys.exit(1)
+                    print("Invalid image, no FLVALSIG found!")
+                    self.EXIT_CODE = False
+                    return False
             if self.VERBOSITY > 0:
                 print("FLVALSIG: {0:#0{1}x}".format(valsig, 0x0A))
 
@@ -100,6 +102,7 @@ def load_image_file(self, image_path):
                     FRBA : (FRBA + (0x04 * self.NUMBER_OF_REGIONS))
                 ],
             )
+            return True
 
     def get_region_data(self, pIndex, pName):
         if self.REGIONS[pIndex] == 0x00007FFF:
@@ -151,5 +154,5 @@ def dump_region(self, pIndex, pName):
             print('Region "' + pName + '" dumped to: ' + pName + "_dump.bin")
         else:
             if self.VERBOSITY > 0:
-                print("FATAL: region dump failed.")
+                print("Region dump failed.")
             self.EXIT_CODE = 1

osfv_cli/src/osfv/libs/utils.py

@@ -67,7 +67,13 @@ def check_flash_image_regions(
         flash_image.set_verbosity(1)
 
     print(f"Verifying flash image completeness of {rom} ...")
-    flash_image.load_image_file(rom)
+    if not flash_image.load_image_file(rom):
+        print(
+            "Failed to load image file. Cannot verify the presence of Intel regions."
+        )
+        if dry_run:
+            return True
+        return False
 
     for check_region_name in regions:
         check_region_index = flash_image.get_region_index(check_region_name)