Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: client/site_tests/hardware_Components/hardware_Components.py

Issue 3246002: Add flashrom memory layout detection by FMAP (using fmap_decode) (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git
Patch Set: change site_fmap license header Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/site_tests/factory_EnableWriteProtect/factory_EnableWriteProtect.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/site_tests/hardware_Components/hardware_Components.py
diff --git a/client/site_tests/hardware_Components/hardware_Components.py b/client/site_tests/hardware_Components/hardware_Components.py
index 8574e0b79e62e7e2c724b233ab3781218f30d1e0..ae4ff06825238118fe284b83011d00fd18facecb 100644
--- a/client/site_tests/hardware_Components/hardware_Components.py
+++ b/client/site_tests/hardware_Components/hardware_Components.py
@@ -239,7 +239,9 @@ class hardware_Components(test.test):
raise error.TestError('Cannot select BIOS flashrom')
base_img = flashrom.read_whole()
flashrom_size = len(base_img)
- layout = flashrom.detect_chromeos_bios_layout(flashrom_size)
+ # XXX we can NOT trust base image here for layout, otherwise firmware
+ # can provide fake (non-used) GBB/BSTUB in garbage area.
+ layout = flashrom.detect_chromeos_bios_layout(flashrom_size, None)
if not layout:
raise error.TestError('Cannot detect ChromeOS flashrom laout')
hash_src = ''
@@ -268,7 +270,8 @@ class hardware_Components(test.test):
raise error.TestError('Cannot select BIOS flashrom')
base_img = flashrom.read_whole()
flashrom_size = len(base_img)
- layout = flashrom.detect_chromeos_bios_layout(flashrom_size)
+ # we can trust base image for layout, since it's only RW.
+ layout = flashrom.detect_chromeos_bios_layout(flashrom_size, base_imge)
if not layout:
raise error.TestError('Cannot detect ChromeOS flashrom laout')
for index, name in enumerate(section_names):
« no previous file with comments | « client/site_tests/factory_EnableWriteProtect/factory_EnableWriteProtect.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698