commit b4f50e350beb3952e6b86e169a37577d15684f6a
author Gabe Black <gabeblack@chromium.org> Wed Oct 05 03:38:11 2011 -0700
committer Gabe Black (Do Not Use) <gabeblack@google.com> Thu Oct 06 02:45:56 2011 -0700
tree a62d222e8bb813573c87bf1ef52cac293894927e
parent 8a0bc4a366684200fbf935dba968eaace234438d

Revert "Use the new "bios-base" option to adjust the offset of sections in the fmap"

This reverts commit a0a9222aa29f22f39024fcce767c203231f490fc.

The bios-base setting has been deprecated.

BUG=None
TEST=Built and booted on Stumpy.

Signed-off-by: Gabe Black <gabeblack@google.com>
Change-Id: If8706c44124ace73e2dd4070e69d63b0b3f198ef
Reviewed-on: http://gerrit.chromium.org/gerrit/8824
Reviewed-by: Stefan Reinauer <reinauer@google.com>

host/lib/fdt.py

diff --git a/host/lib/fdt.py b/host/lib/fdt.py
index b4fbf83..a8a5e97 100644
--- a/host/lib/fdt.py
+++ b/host/lib/fdt.py
@@ -140,7 +140,7 @@
           num_values))
     return [int(item) for item in int_list]
 
-  def GetIntList(self, key, num_values=None, default=None):
+  def GetIntList(self, key, num_values=None):
     """Read a key and decode it into a list of integers.
 
     >>> tools = Tools(cros_output.Output())
@@ -181,9 +181,9 @@
       ValueError if the list is the wrong size.
       CmdError: if the property does not exist.
     """
-    return self.DecodeIntList(key, self.GetProp(key, default), num_values)
+    return self.DecodeIntList(key, self.GetProp(key), num_values)
 
-  def GetInt(self, key, default=None):
+  def GetInt(self, key):
     """Gets an integer from a device tree property.
 
     >>> tools = Tools(cros_output.Output())
@@ -207,7 +207,7 @@
       ValueError if the property cannot be converted to an integer.
       CmdError: if the property does not exist.
     """
-    value = self.GetIntList(key, 1, default)[0]
+    value = self.GetIntList(key, 1)[0]
     return int(value)
 
   def GetString(self, key, default=None):

host/lib/pack_firmware.py

diff --git a/host/lib/pack_firmware.py b/host/lib/pack_firmware.py
index 85928f0..151da76 100644
--- a/host/lib/pack_firmware.py
+++ b/host/lib/pack_firmware.py
@@ -12,7 +12,7 @@
 import sys
 import tempfile
 
-from tools import Tools, CmdError
+from tools import Tools
 from fdt import Fdt
 import tools
 
@@ -45,7 +45,7 @@
 )
 
 FMAP_AREA_NAMES = (
-    'rom_offset',
+    'offset',
     'size',
     'name',
     'flags',
@@ -482,7 +482,6 @@
     self.fdt = fdt
     root = '/flash/'
     self.image_size = int(fdt.GetIntList(root + 'reg', 2)[1])
-    bios_base = int(fdt.GetInt(root + 'bios-base', 0))
 
     # Scan the flash map in the fdt, creating a list of Entry objects.
     re_label = re.compile('(.*)-(\w*)')
@@ -494,7 +493,6 @@
       # Read the two cells from the node's /reg property to get entry extent.
       offset, size = fdt.DecodeIntList(node + '/reg', props['reg'], 2)
       props['offset'] = offset
-      props['rom_offset'] = offset + bios_base
       props['size'] = size
 
       # The section names must be upper case with underscores, for other tools