Remove default BIOS flashrom memory layout

client/common_lib/flashrom_util.py

 #!/usr/bin/env python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This module provides convenience routines to access Flash ROM (EEPROM).
  - flashrom_util is a low level wrapper of flashrom(8) program.
  - FlashromUtility is a high level object which provides more advanced
    features like journaling-alike (log-based) changing.
@@ skipping 25 matching lines @@
 
 # The location of flashrom(8)' tool binary
 DEFAULT_FLASHROM_TOOL_PATH = '/usr/sbin/flashrom'
 
 # The default target names for BIOS and Embedded Controller (EC)
 DEFAULT_TARGET_NAME_BIOS= 'bios'
 DEFAULT_TARGET_NAME_EC = 'ec'
 
 # The default description of ChromeOS firmware layout
 # Check help(compile_layout) for the syntax.
-# NOTE: "FVMAIN" is not typo, although it seems like lack of 'A' as postfix.
+# NOTE: Since the memory layout of BIOS may change very often,
+#       the default layout is removed to prevent confusion.
+#       Any BIOS image without FMAP is considered as corrupted.
 DEFAULT_CHROMEOS_FIRMWARE_LAYOUT_DESCRIPTIONS = {
-    "bios": """
-            FV_LOG          = 0x20000,
-            NV_COMMON_STORE = 0x10000,
-            VBOOTA          = 0x02000,
-            FVMAIN          = 0xB0000,
-            VBOOTB          = 0x02000,
-            FVMAINB         = 0xB0000,
-            NVSTORAGE       = 0x10000,
-            FV_RW_RESERVED  = *,
-            |
-            FV_RO_RESERVED  = *,
-            FVDEV           = 0xB0000,
-            FV_GBB          = 0x20000,
-            FV_BSTUB        = 0x40000,
-            """,
+    "bios": "",  # retrieve from fmap, no defaults.
     "ec": """
             EC_RO
             |
             EC_RW
           """,
 }
 
 # The default conversion table for fmap_decode.
+# NOTE: "FVMAIN" is not typo, although it seems like lack of 'A' as postfix.
 DEFAULT_CHROMEOS_FMAP_CONVERSION = {
     "Boot Stub": "FV_BSTUB",
     "GBB Area": "FV_GBB",
     "Recovery Firmware": "FVDEV",
     "RO VPD": "RO_VPD",
     "Firmware A Key": "VBOOTA",
     "Firmware A Data": "FVMAIN",
     "Firmware B Key": "VBOOTB",
     "Firmware B Data": "FVMAINB",
     "Log Volume": "FV_LOG",
@@ skipping 847 matching lines @@
 except ImportError:
     # print 'using mocks'
     utils = mock_utils()
     TestError = mock_TestError
 
 
 # main stub
 if __name__ == "__main__":
     # TODO(hungte) provide unit tests or command line usage
     pass