Merge lp:~milo/linaro-image-tools/fix-tests into lp:linaro-image-tools/11.11

[Milo Casagrande]

Test fixes and refactoring.

This is the final branch with test fixes and new test added.
Some work still needs to be done though, 14 tests are still failing.

[lp:~milo/linaro-image-tools/fix-tests]

595. By Milo Casagrande on 2012-12-06

Added MagicMock import, fixed one test.

596. By Milo Casagrande on 2012-12-07

Fixed almost all tests, 2 to go.

597. By Milo Casagrande on 2012-12-07

Merged hwpack-args into fix-tests.

598. By Milo Casagrande on 2012-12-07

Fixed last tests not passing.

[Milo Casagrande (milo)]

With the last commit all tests should be fine now. There is really the need to kill hwpack v1 though: the vast majority of the tests are dealing with the fixes for v1 or its workarounds.

[lp:~milo/linaro-image-tools/fix-tests]

599. By Milo Casagrande on 2012-12-10

Merged from pipe, after conflict resolution.

600. By Milo Casagrande on 2012-12-10

Merged hwpack-args into fix-tests.

601. By Milo Casagrande on 2012-12-10

Fixed PEP8 warning.

602. By Milo Casagrande on 2012-12-10

Added missing copyright header, fixed years.

603. By Milo Casagrande on 2012-12-11

Merged hwpack-args into fix-tests.

604. By Milo Casagrande on 2012-12-11

Fixed tests with new attribute name.

605. By Milo Casagrande on 2012-12-27

Merged hwpack-args into fix-tests.

606. By Milo Casagrande on 2012-12-27

Merged hwpack-args into fix-tests.

607. By Milo Casagrande on 2012-12-27

Fixed two tests.

608. By Milo Casagrande on 2012-12-27

Merged hwpack-args into fix-tests.

609. By Milo Casagrande on 2012-12-27

Fixed arndale tests, cleaned-up code.

610. By Milo Casagrande on 2012-12-28

Added tests for default instance values with Android boards.

[Данило Шеган (danilo)]

Make yaml files as strings more readable (make a template, extract into a helper function to put in only the values that you care about in a particular test, etc). Other than that, looks good.

Thanks!

review: Approve

[lp:~milo/linaro-image-tools/fix-tests]

611. By Milo Casagrande on 2012-12-28

Merged hwpack-args into fix-tests.

612. By Milo Casagrande on 2012-12-28

Refactored tests: made YAML string a little bit more readable.

613. By Milo Casagrande on 2013-01-02

Removed wrong method call.

614. By Milo Casagrande on 2013-01-02

Refactored field name, handled file opening.

615. By Milo Casagrande on 2013-01-03

Fixed problem with StringIO, now use tmp file.

616. By Milo Casagrande on 2013-01-03

Refactored and harmonized variable name.

[James Tunnicliffe (dooferlad)]

226 @@ -132,8 +133,9 @@
227 :return The configuration read from the file as a dictionary.
228 """
229 try:
230 - config = yaml.safe_load(hwpack)
231 - self._set_attributes(config)
232 + with open(hwpack, 'r') as hw:
233 + config = yaml.safe_load(hw)
234 + self._set_attributes(config)
235 return config
236 except yaml.YAMLError, ex:
237 logger.debug("Error loading YAML file %s" % hwpack, ex)

I believe that since we are opening a file inside the with statement, we also need to catch the IOError exception for when the file doesn't exist. Other than that, looks good.

[Milo Casagrande (milo)]

On Thu, Jan 3, 2013 at 12:24 PM, James Tunnicliffe
<email address hidden> wrote:
> 226 @@ -132,8 +133,9 @@
> 227 :return The configuration read from the file as a dictionary.
> 228 """
> 229 try:
> 230 - config = yaml.safe_load(hwpack)
> 231 - self._set_attributes(config)
> 232 + with open(hwpack, 'r') as hw:
> 233 + config = yaml.safe_load(hw)
> 234 + self._set_attributes(config)
> 235 return config
> 236 except yaml.YAMLError, ex:
> 237 logger.debug("Error loading YAML file %s" % hwpack, ex)
>
> I believe that since we are opening a file inside the with statement, we also need to catch the IOError exception for when the file doesn't exist. Other than that, looks good.

We are actually checking this in linaro-android-media-create, making
sure the arg passed is a real file and it exists, otherwise exit
immediately.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[James Tunnicliffe (dooferlad)]

I would be tempted to be ready to catch the exception anyway - could be an unreadable file (permissions) or we may change linaro-android-media-create at some point in the future and lose the existence check. I don't have a strong opinion about it though.

review: Approve

[lp:~milo/linaro-image-tools/fix-tests]

617. By Milo Casagrande on 2013-01-03

Catch exception on missing file, added test.

=== modified file 'linaro-media-create'
--- linaro-media-create	2013-01-03 13:57:23 +0000
+++ linaro-media-create	2013-01-03 13:57:23 +0000
@@ -133,7 +133,6 @@
 
     board_config = get_board_config(args.dev)
     board_config.set_metadata(args.hwpacks, args.bootloader, args.dev)
-    board_config.board(args.dev)
     board_config.add_boot_args(args.extra_boot_args)
     board_config.add_boot_args_from_file(args.extra_boot_args_file)
 
@@ -152,9 +151,6 @@
         logger.error("Do not use --no-boot or --no-part in conjunction with "
                      "--image_file.")
         sys.exit(1)
-    else:
-        # All good, move on.
-        pass
 
     # If --help was specified this won't execute.
     # Create temp dir and initialize rest of path vars.

=== modified file 'linaro_image_tools/hwpack/config.py'
--- linaro_image_tools/hwpack/config.py	2012-12-07 08:47:58 +0000
+++ linaro_image_tools/hwpack/config.py	2013-01-03 13:57:23 +0000
@@ -296,7 +296,7 @@
             self._validate_mmc_id()
             self._validate_extra_boot_options()
             self._validate_boot_script()
-            self._validate_extra_serial_opts()
+            self._validate_extra_serial_options()
             self._validate_snowball_startup_files_config()
             self._validate_samsung_bl1_start()
             self._validate_samsung_bl1_len()
@@ -620,7 +620,7 @@
                                            join_list_with=" ")
 
     @property
-    def extra_serial_opts(self):
+    def extra_serial_options(self):
         """Extra serial options.
 
         A str.
@@ -1021,7 +1021,7 @@
         # Optional and tricky to determine a valid pattern.
         pass
 
-    def _validate_extra_serial_opts(self):
+    def _validate_extra_serial_options(self):
         # Optional and tricky to determine a valid pattern.
         pass
 

=== modified file 'linaro_image_tools/hwpack/hardwarepack.py'
--- linaro_image_tools/hwpack/hardwarepack.py	2012-12-07 08:47:58 +0000
+++ linaro_image_tools/hwpack/hardwarepack.py	2013-01-03 13:57:23 +0000
@@ -128,7 +128,7 @@
                       env_dd=None, boot_script=None,
                       bootloader_file_in_boot_part=None,
                       uboot_dd=None, spl_in_boot_part=None, spl_dd=None,
-                      extra_serial_opts=None, loader_start=None,
+                      extra_serial_options=None, loader_start=None,
                       snowball_startup_files_config=None,
                       samsung_bl1_start=None, samsung_bl1_len=None,
                       samsung_env_start=None, samsung_env_len=None,
@@ -162,7 +162,7 @@
         self.spl_in_boot_part = spl_in_boot_part
         self.spl_dd = spl_dd
         self.env_dd = env_dd
-        self.extra_serial_opts = extra_serial_opts
+        self.extra_serial_options = extra_serial_options
         self.snowball_startup_files_config = snowball_startup_files_config
         self.samsung_bl1_start = samsung_bl1_start
         self.samsung_bl1_len = samsung_bl1_len
@@ -216,7 +216,7 @@
                 dtb_file=config.dtb_file,
                 env_dd=config.env_dd,
                 extra_boot_options=config.extra_boot_options,
-                extra_serial_opts=config.extra_serial_opts,
+                extra_serial_options=config.extra_serial_options,
                 initrd_addr=config.initrd_addr,
                 initrd=config.initrd,
                 kernel_addr=config.kernel_addr,
@@ -320,12 +320,12 @@
             metadata += dump({DTB_FILES_FIELD: self.dtb_files})
         if self.boot_script is not None:
             metadata += dump({BOOT_SCRIPT_FIELD: self.boot_script})
-        if self.extra_serial_opts is not None:
+        if self.extra_serial_options is not None:
             # XXX Check why and where once we get a list once a string.
-            if isinstance(self.extra_serial_opts, list):
-                extra_serial_options = " ".join(self.extra_serial_opts)
+            if isinstance(self.extra_serial_options, list):
+                extra_serial_options = " ".join(self.extra_serial_options)
             else:
-                extra_serial_options = self.extra_serial_opts
+                extra_serial_options = self.extra_serial_options
             metadata += dump({
                             EXTRA_SERIAL_OPTIONS_FIELD:
                             extra_serial_options})
@@ -417,8 +417,8 @@
             metadata += "SPL_DD=%s\n" % self.spl_dd
         if self.env_dd is not None:
             metadata += "ENV_DD=%s\n" % self.env_dd
-        if self.extra_serial_opts is not None:
-            metadata += "EXTRA_SERIAL_OPTIONS=%s\n" % self.extra_serial_opts
+        if self.extra_serial_options is not None:
+            metadata += "EXTRA_SERIAL_OPTIONS=%s\n" % self.extra_serial_options
         if self.snowball_startup_files_config is not None:
             metadata += "SNOWBALL_STARTUP_FILES_CONFIG=%s\n" % (
                 self.snowball_startup_files_config)

=== modified file 'linaro_image_tools/hwpack/tests/__init__.py'
--- linaro_image_tools/hwpack/tests/__init__.py	2012-07-25 09:00:58 +0000
+++ linaro_image_tools/hwpack/tests/__init__.py	2013-01-03 13:57:23 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Linaro
+# Copyright (C) 2010, 2011, 2012 Linaro
 #
 # Author: James Westby <[e-mail]>
 #

=== modified file 'linaro_image_tools/hwpack/tests/test_config.py'
--- linaro_image_tools/hwpack/tests/test_config.py	2012-08-28 17:34:16 +0000
+++ linaro_image_tools/hwpack/tests/test_config.py	2013-01-03 13:57:23 +0000
@@ -503,11 +503,11 @@
             "omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000",
             config.extra_boot_options)
 
-    def test_extra_serial_opts(self):
+    def test_extra_serial_options(self):
         config = self.get_config(self.valid_complete_v2 + self.valid_end)
         config.validate()
         self.assertEqual("console=tty0 console=ttyO2,115200n8",
-                         config.extra_serial_opts)
+                         config.extra_serial_options)
 
     def test_boot_script(self):
         config = self.get_config(self.valid_complete_v2 + self.valid_end)

=== modified file 'linaro_image_tools/hwpack/tests/test_config_v3.py'
--- linaro_image_tools/hwpack/tests/test_config_v3.py	2012-12-27 10:29:42 +0000
+++ linaro_image_tools/hwpack/tests/test_config_v3.py	2013-01-03 13:57:23 +0000
@@ -518,11 +518,11 @@
             "omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000",
             config.extra_boot_options)
 
-    def test_extra_serial_opts(self):
+    def test_extra_serial_options(self):
         config = self.get_config(self.valid_complete_v3 + self.valid_end)
         config.validate()
         self.assertEqual('console=tty0 console=ttyO2,115200n8',
-                         config.extra_serial_opts)
+                         config.extra_serial_options)
 
     def test_boot_script(self):
         config = self.get_config(self.valid_complete_v3 + self.valid_end)

=== modified file 'linaro_image_tools/hwpack/tests/test_hardwarepack.py'
--- linaro_image_tools/hwpack/tests/test_hardwarepack.py	2012-07-23 14:44:37 +0000
+++ linaro_image_tools/hwpack/tests/test_hardwarepack.py	2013-01-03 13:57:23 +0000
@@ -257,7 +257,7 @@
         metadata = Metadata("ahwpack", "4", "armel",
                             format=HardwarePackFormatV2())
         metadata.add_v2_config(
-            extra_serial_opts='console=tty0 console=ttyO2,115200n8')
+            extra_serial_options='console=tty0 console=ttyO2,115200n8')
         expected_out = ("NAME=ahwpack\nVERSION=4\n"
                         "ARCHITECTURE=armel\nEXTRA_SERIAL_OPTIONS="
                         "console=tty0 console=ttyO2,115200n8\n")
@@ -335,7 +335,7 @@
                                     format=HardwarePackFormatV3())
         options = ['option1', 'option2,option3']
         # Need to call also this one!
-        metadata.add_v2_config(extra_serial_opts=options)
+        metadata.add_v2_config(extra_serial_options=options)
         metadata.add_v3_config(bootloaders=None)
         expected_out = ("format: '3.0'\nname: ahwpack\nversion: '4'\n"
                         "architecture: armel\nextra_serial_options: option1 "

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2013-01-03 13:57:23 +0000
+++ linaro_image_tools/media_create/android_boards.py	2013-01-03 13:57:23 +0000
@@ -32,6 +32,7 @@
 import logging
 
 from linaro_image_tools import cmd_runner
+from linaro_image_tools.hwpack.hwpack_fields import FORMAT_FIELD
 from linaro_image_tools.media_create.partitions import SECTOR_SIZE
 from linaro_image_tools.media_create.boards import (
     BeagleConfig,
@@ -68,7 +69,7 @@
     def __init__(self):
         super(AndroidBoardConfig, self).__init__()
         self.dtb_name = None
-        self._extra_serial_opts = []
+        self._extra_serial_options = []
         self._android_specific_args = []
         self._extra_boot_args_options = []
         self._live_serial_options = []
@@ -97,17 +98,17 @@
     extra_boot_args_options = property(_get_extra_boot_args_options,
                                        _set_extra_boot_args_options)
 
-    def _get_extra_serial_opts(self):
-        extra_serial = self._extra_serial_opts
+    def _get_extra_serial_options(self):
+        extra_serial = self._extra_serial_options
         if isinstance(extra_serial, list):
-            extra_serial = ' '.join(self._extra_serial_opts)
+            extra_serial = ' '.join(self._extra_serial_options)
         return extra_serial
 
-    def _set_extra_serial_opts(self, value):
-        self._extra_serial_opts = value
+    def _set_extra_serial_options(self, value):
+        self._extra_serial_options = value
 
-    extra_serial_opts = property(_get_extra_serial_opts,
-                                 _set_extra_serial_opts)
+    extra_serial_options = property(_get_extra_serial_options,
+                                 _set_extra_serial_options)
 
     def _get_live_serial_options(self):
         serial_options = self._live_serial_options
@@ -132,13 +133,18 @@
         :return The configuration read from the file as a dictionary.
         """
         try:
-            config = yaml.safe_load(hwpack)
+            with open(hwpack, 'r') as hw:
+                config = yaml.safe_load(hw)
             self._set_attributes(config)
             return config
         except yaml.YAMLError, ex:
             logger.debug("Error loading YAML file %s" % hwpack, ex)
             raise BoardConfigException("Error reading Android hwpack %s"
                                        % hwpack)
+        except IOError, ex:
+            logger.debug("Error reading hwpack file %s" % hwpack, ex)
+            raise BoardConfigException("Android hwpack %s could not be found"
+                                       % hwpack)
 
     def _set_attributes(self, config):
         """Initialize the class attributes with the values read from the
@@ -147,7 +153,9 @@
         :param config: The config read from the Android hwpack.
         """
         for name, value in config.iteritems():
-            if hasattr(self, name):
+            if name == FORMAT_FIELD:
+                setattr(self, 'hwpack_format', value)
+            elif hasattr(self, name):
                 setattr(self, name, value)
             else:
                 logger.warning("Attribute '%s' does not belong to this "
@@ -162,7 +170,7 @@
         if self.extra_boot_args_options:
             boot_args_options += ' %s' % self.extra_boot_args_options
         boot_args_options += ' %s' % self.android_specific_args
-        serial_opts = self.extra_serial_opts
+        serial_opts = self.extra_serial_options
         for console in consoles:
             serial_opts += ' console=%s' % console
 
@@ -281,7 +289,7 @@
     def __init__(self):
         super(AndroidBeagleConfig, self).__init__()
         self._android_specific_args = 'init=/init androidboot.console=ttyO2'
-        self._extra_serial_opts = 'console=tty0 console=ttyO2,115200n8'
+        self._extra_serial_options = 'console=tty0 console=ttyO2,115200n8'
 
 
 class AndroidPandaConfig(AndroidBoardConfig, PandaConfig):
@@ -289,7 +297,7 @@
     def __init__(self):
         super(AndroidPandaConfig, self).__init__()
         self.dtb_name = 'board.dtb'
-        self._extra_serial_opts = 'console=ttyO2,115200n8'
+        self._extra_serial_options = 'console=ttyO2,115200n8'
         self._extra_boot_args_options = (
             'earlyprintk fixrtc nocompcache vram=48M '
             'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000')
@@ -307,7 +315,7 @@
         self._extra_boot_args_options = (
             'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
             'mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=500M')
-        self._extra_serial_opts = 'console=ttyAMA2,115200n8'
+        self._extra_serial_options = 'console=ttyAMA2,115200n8'
         self.boot_script = 'boot.scr'
         self.fdt_high = '0x05000000'
         self.initrd_addr = '0x05000000'
@@ -323,7 +331,7 @@
         self._extra_boot_args_options = (
             'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
             'mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=500M')
-        self._extra_serial_opts = 'console=ttyAMA2,115200n8'
+        self._extra_serial_options = 'console=ttyAMA2,115200n8'
         self._android_specific_args = 'init=/init androidboot.console=ttyAMA2'
         self.boot_script = 'boot.scr'
         self.fdt_high = '0x05000000'
@@ -379,11 +387,11 @@
         super(AndroidMx53LoCoConfig, self).__init__()
         self._extra_boot_args_options = (
             'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve')
-        self._extra_serial_opts = 'console=%s,115200n8'
+        self._extra_serial_options = 'console=%s,115200n8'
         self._android_specific_args = 'init=/init androidboot.console=%s'
 
-    def _get_extra_serial_opts(self):
-        serial_opts = self._extra_serial_opts
+    def _get_extra_serial_options(self):
+        serial_opts = self._extra_serial_options
         if serial_opts:
             if isinstance(serial_opts, list):
                 serial_opts = ' '.join(serial_opts)
@@ -391,11 +399,11 @@
                 serial_opts = serial_opts % self.serial_tty
         return serial_opts
 
-    def _set_extra_serial_opts(self, value):
-        self._extra_serial_opts = value
+    def _set_extra_serial_options(self, value):
+        self._extra_serial_options = value
 
-    extra_serial_opts = property(_get_extra_serial_opts,
-                                 _set_extra_serial_opts)
+    extra_serial_options = property(_get_extra_serial_options,
+                                 _set_extra_serial_options)
 
     def _get_android_specific_args(self):
         android_args = self._android_specific_args
@@ -461,7 +469,7 @@
     """Placeholder class for SMDKV310 configuration inheritance."""
     def __init__(self):
         super(AndroidSMDKV310Config, self).__init__()
-        self._extra_serial_opts = 'console=tty0 console=ttySAC1,115200n8'
+        self._extra_serial_options = 'console=tty0 console=ttySAC1,115200n8'
         self._android_specific_args = 'init=/init androidboot.console=ttySAC1'
 
 
@@ -469,14 +477,14 @@
     """Placeholder class for Origen configuration inheritance."""
     def __init__(self):
         super(AndroidOrigenConfig, self).__init__()
-        self._extra_serial_opts = 'console=tty0 console=ttySAC2,115200n8'
+        self._extra_serial_options = 'console=tty0 console=ttySAC2,115200n8'
         self._android_specific_args = 'init=/init androidboot.console=ttySAC2'
 
 
 class AndroidOrigenQuadConfig(AndroidSamsungConfig, OrigenQuadConfig):
     def __init__(self):
         super(AndroidOrigenQuadConfig, self).__init__()
-        self._extra_serial_opts = 'console=tty0 console=ttySAC2,115200n8'
+        self._extra_serial_options = 'console=tty0 console=ttySAC2,115200n8'
         self._android_specific_args = 'init=/init androidboot.console=ttySAC2'
 
 
@@ -484,7 +492,7 @@
     """Placeholder class for Vexpress configuration inheritance."""
     def __init__(self):
         super(AndroidVexpressConfig, self).__init__()
-        self._extra_serial_opts = 'console=tty0 console=ttyAMA0,38400n8'
+        self._extra_serial_options = 'console=tty0 console=ttyAMA0,38400n8'
         self._android_specific_args = 'init=/init androidboot.console=ttyAMA0'
 
 

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-01-03 13:57:23 +0000
+++ linaro_image_tools/media_create/boards.py	2013-01-03 13:57:23 +0000
@@ -69,7 +69,7 @@
     SAMSUNG_BL2_LEN_FIELD,
     SAMSUNG_BL2_START_FIELD,
     SAMSUNG_ENV_LEN_FIELD,
-    SAMSUNG_ENV_START_FILED,
+    SAMSUNG_ENV_START_FIELD,
     SERIAL_TTY_FIELD,
     SNOWBALL_STARTUP_FILES_CONFIG_FIELD,
     SPL_DD_FIELD,
@@ -150,7 +150,7 @@
         # leading underscore. It is done in this way since sublcasses use
         # placeholders in the string for dinamically change values. But this
         # is done only for hwpack v1.
-        self._extra_serial_opts = ''
+        self._extra_serial_options = ''
         self._live_serial_opts = ''
         self.board = None
         self.boot_script = None
@@ -198,7 +198,7 @@
         #
         # samsung_bl1_{start,len}: Offset and maximum size for BL1
         # samsung_bl2_{start,len}: Offset and maximum size for BL2
-        # samsung_env_{start,len}: Offset and maximum size for Environment settings
+        # samsung_env_{start,len}: Offset and maximum size for settings
         #
         self.samsung_bl1_start = 1
         self.samsung_bl1_len = 32
@@ -223,17 +223,17 @@
     live_serial_opts = property(_get_live_serial_opts, _set_live_serial_opts)
 
     # XXX: can be removed when killing v1 hwpack.
-    def _get_extra_serial_opts(self):
-        return_value = self._extra_serial_opts
+    def _get_extra_serial_options(self):
+        return_value = self._extra_serial_options
         if self._check_placeholder_presence(return_value, r'%s'):
             return_value = return_value % self.serial_tty
         return return_value
 
-    def _set_extra_serial_opts(self, value):
-        self._extra_serial_opts = value
+    def _set_extra_serial_options(self, value):
+        self._extra_serial_options = value
 
-    extra_serial_opts = property(_get_extra_serial_opts,
-                                 _set_extra_serial_opts)
+    extra_serial_options = property(_get_extra_serial_options,
+                                 _set_extra_serial_options)
 
     def get_metadata_field(self, field_name):
         """ Return the metadata value for field_name if it can be found.
@@ -269,8 +269,8 @@
                 self.samsung_bl1_len = None
                 self.samsung_env_len = None
                 self.samsung_bl2_len = None
-                # cls.samsung_bl2_start and cls.samsung_env_start should
-                # be initialized to default values for backward compatibility.
+                # self.samsung_bl2_start and self.samsung_env_start should
+                # be initialized to default value for backward compatibility.
 
             self.board = board
             # Set new values from metadata.
@@ -296,7 +296,7 @@
             self.extra_boot_args_options = self.get_metadata_field(
                 EXTRA_BOOT_OPTIONS_FIELD)
             self.boot_script = self.get_metadata_field(BOOT_SCRIPT_FIELD)
-            self.extra_serial_opts = self.get_metadata_field(
+            self.extra_serial_options = self.get_metadata_field(
                 EXTRA_SERIAL_OPTIONS_FIELD)
             self.snowball_startup_files_config = self.get_metadata_field(
                 SNOWBALL_STARTUP_FILES_CONFIG_FIELD)
@@ -376,16 +376,16 @@
             samsung_env_len = self.get_metadata_field(SAMSUNG_ENV_LEN_FIELD)
             if samsung_env_len:
                 self.samsung_v310_env_len = int(samsung_env_len)
+            samsung_bl2_start = \
+                self.get_metadata_field(SAMSUNG_BL2_START_FIELD)
+            if samsung_bl2_start:
+                self.samsung_bl2_start = int(samsung_bl2_start)
             samsung_bl2_len = self.get_metadata_field(SAMSUNG_BL2_LEN_FIELD)
             if samsung_bl2_len:
                 self.samsung_v310_bl2_len = int(samsung_bl2_len)
-            samsung_bl2_start = self.get_metadata_field(
-                SAMSUNG_BL2_START_FIELD)
-            if samsung_bl2_start:
-                self.samsung_bl2_start = int(samsung_bl2_start)
-            samsung_env_start = self.get_metadata_field(
-                SAMSUNG_ENV_START_FILED)
-            if samsung_env_start:
+            samsung_env_start = \
+                self.get_metadata_field(SAMSUNG_ENV_START_FIELD)
+            if samsung_env_start is not None:
                 self.samsung_env_start = int(samsung_env_start)
 
             self.bootloader_copy_files = self.hardwarepack_handler.get_field(
@@ -540,7 +540,7 @@
         boot_args_options = 'rootwait ro'
         if self.extra_boot_args_options:
             boot_args_options += ' %s' % self.extra_boot_args_options
-        serial_opts = self.extra_serial_opts
+        serial_opts = self.extra_serial_options
         for console in consoles:
             serial_opts += ' console=%s' % console
 
@@ -945,7 +945,7 @@
         self.kernel_addr = '0x80000000'
         self.load_addr = '0x80008000'
         self._serial_tty = 'ttyO2'
-        self._extra_serial_opts = 'console=tty0 console=%s,115200n8'
+        self._extra_serial_options = 'console=tty0 console=%s,115200n8'
         self._live_serial_opts = 'serialtty=%s'
 
 
@@ -962,7 +962,7 @@
         self.initrd_addr = '0x81600000'
         self.kernel_addr = '0x80000000'
         self.load_addr = '0x80008000'
-        self._extra_serial_opts = 'console=tty0 console=%s,115200n8'
+        self._extra_serial_options = 'console=tty0 console=%s,115200n8'
         self._serial_tty = 'ttyO2'
 
 
@@ -980,7 +980,7 @@
         self.initrd_addr = '0x81600000'
         self.kernel_addr = '0x80200000'
         self.load_addr = '0x80008000'
-        self._extra_serial_opts = 'console=tty0 console=%s,115200n8'
+        self._extra_serial_options = 'console=tty0 console=%s,115200n8'
         self._live_serial_opts = 'serialtty=%s'
 
 
@@ -1019,7 +1019,7 @@
         self.load_addr = '0x00008000'
         self.mmc_option = '1:1'
         self.serial_tty = 'ttyAMA2'
-        self._extra_serial_opts = 'console=tty0 console=%s,115200n8'
+        self._extra_serial_options = 'console=tty0 console=%s,115200n8'
         self._live_serial_opts = 'serialtty=%s'
 
     def _make_boot_files(self, boot_env, chroot_dir, boot_dir,
@@ -1230,7 +1230,7 @@
         self.mmc_option = '0:2'
         self.mmc_part_offset = 1
         self.serial_tty = 'ttymxc0'
-        self._extra_serial_opts = 'console=tty0 console=%s,115200n8'
+        self._extra_serial_options = 'console=tty0 console=%s,115200n8'
         self._live_serial_opts = 'serialtty=%s'
 
     def get_v1_sfdisk_cmd(self, should_align_boot_part=None):
@@ -1341,7 +1341,7 @@
         self.kernel_flavors = ['linaro-vexpress']
         self.load_addr = '0x60008000'
         self.serial_tty = 'ttyAMA0'
-        self._extra_serial_opts = 'console=tty0 console=%s,38400n8'
+        self._extra_serial_options = 'console=tty0 console=%s,38400n8'
         self._live_serial_opts = 'serialtty=%s'
 
     def _make_boot_files(self, boot_env, chroot_dir, boot_dir,
@@ -1390,7 +1390,7 @@
 class SamsungConfig(BoardConfig):
     def __init__(self):
         super(SamsungConfig, self).__init__()
-        self._extra_serial_opts = None
+        self._extra_serial_options = None
 
     def get_v1_sfdisk_cmd(self, should_align_boot_part=False):
         # bootloaders partition needs to hold BL1, U-Boot environment, and BL2
@@ -1505,7 +1505,7 @@
         self.mmc_option = '0:2'
         self.mmc_part_offset = 1
         self.serial_tty = 'ttySAC1'
-        self._extra_serial_opts = 'console=%s,115200n8'
+        self._extra_serial_options = 'console=%s,115200n8'
 
     def _get_boot_env(self, is_live, is_lowmem, consoles, rootfs_id,
                       i_img_data, d_img_data):
@@ -1531,7 +1531,7 @@
         self.mmc_option = '0:2'
         self.mmc_part_offset = 1
         self.serial_tty = 'ttySAC2'
-        self._extra_serial_opts = 'console=%s,115200n8'
+        self._extra_serial_options = 'console=%s,115200n8'
 
 
 class OrigenQuadConfig(SamsungConfig):
@@ -1549,7 +1549,7 @@
         self.samsung_bl2_start = 49
         self.samsung_env_start = 1073
         self.serial_tty = 'ttySAC2'
-        self._extra_serial_opts = 'console=%s,115200n8'
+        self._extra_serial_options = 'console=%s,115200n8'
 
 
 class ArndaleConfig(SamsungConfig):
@@ -1568,7 +1568,7 @@
         self.samsung_bl2_start = 49
         self.samsung_env_start = 1073
         self.serial_tty = 'ttySAC2'
-        self._extra_serial_opts = 'console=%s,115200n8'
+        self._extra_serial_options = 'console=%s,115200n8'
 
 
 class I386Config(BoardConfig):
@@ -1587,7 +1587,7 @@
         super(I386Config, self).__init__()
         self.kernel_flavors = ['generic', 'pae']
         self.serial_tty = 'ttyS0'
-        self._extra_serial_opts = 'console=tty0 console=%s,115200n8'
+        self._extra_serial_options = 'console=tty0 console=%s,115200n8'
         self._live_serial_opts = 'serialtty=%s'
 
     def _make_boot_files(self, boot_env, chroot_dir, boot_dir,
@@ -1609,7 +1609,7 @@
 
         # generate loader config file
         loader_config = self.BOOTLOADER_CFG % (os.path.basename(k_img_data),
-            self.extra_serial_opts, os.path.basename(i_img_data))
+            self.extra_serial_options, os.path.basename(i_img_data))
 
         _, tmpfile = tempfile.mkstemp()
         atexit.register(os.unlink, tmpfile)

=== modified file 'linaro_image_tools/media_create/tests/__init__.py'
--- linaro_image_tools/media_create/tests/__init__.py	2012-06-07 13:12:42 +0000
+++ linaro_image_tools/media_create/tests/__init__.py	2013-01-03 13:57:23 +0000
@@ -1,9 +1,28 @@
+# Copyright (C) 2010, 2011, 2012 Linaro
+#
+# This file is part of Linaro Image Tools.
+#
+# Linaro Image Tools is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Linaro Image Tools is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import unittest
 
 
 def test_suite():
-    module_names = ['linaro_image_tools.media_create.tests.test_media_create',
-                   ]
+    module_names = [
+        'linaro_image_tools.media_create.tests.test_media_create',
+        'linaro_image_tools.media_create.tests.test_android_boards',
+        ]
     loader = unittest.TestLoader()
     suite = loader.loadTestsFromNames(module_names)
     return suite

=== added file 'linaro_image_tools/media_create/tests/test_android_boards.py'
--- linaro_image_tools/media_create/tests/test_android_boards.py	1970-01-01 00:00:00 +0000
+++ linaro_image_tools/media_create/tests/test_android_boards.py	2013-01-03 13:57:23 +0000
@@ -0,0 +1,480 @@
+# Copyright (C) 2010, 2011 Linaro
+#
+# Author: Milo Casagrande <[e-mail]>
+#
+# This file is part of Linaro Image Tools.
+#
+# Linaro Image Tools is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Linaro Image Tools is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from testtools import TestCase
+
+from linaro_image_tools.media_create.boards import (
+    BoardConfigException,
+    )
+
+from linaro_image_tools.media_create.android_boards import (
+    AndroidBeagleConfig,
+    get_board_config,
+    )
+
+from linaro_image_tools.testing import TestCaseWithFixtures
+from linaro_image_tools.tests.fixtures import CreateTempFileFixture
+
+
+class TestAndroidBoards(TestCase):
+    """Class to test small things in android_boards."""
+
+    def test_get_board_config(self):
+        instance = get_board_config('beagle')
+        self.assertIsInstance(instance, AndroidBeagleConfig)
+
+    def test_get_board_config_wrong(self):
+        self.assertRaises(BoardConfigException, get_board_config, 'notadevice')
+
+    def test_hwpack_not_exists(self):
+        instance = get_board_config('beagle')
+        self.assertRaises(BoardConfigException, instance.from_file, 'a_file')
+
+
+class TestAndroidBoardsHwpack(TestCaseWithFixtures):
+    """Class to test the new Android hwpack configuration file."""
+
+    # All the necessary Android hwpack fields for the tests.
+    hwpack_format = 'format: 3.0\n'
+    hwpack_dtb_name = 'dtb_name: %(dtb_name)s\n'
+    hwpack_fdt_high = "fdt_high: '%(fdt_high)s'\n"
+    hwpack_fat_size = 'fat_size: 16\n'
+    hwpack_android_args = 'android_specific_args: %(android_specific_args)s\n'
+    hwpack_extra_serial = 'extra_serial_options: %(extra_serial_options)s\n'
+    hwpack_extra_boot = ('extra_boot_args_options: '
+                         '%(extra_boot_args_options)s\n')
+    hwpack_bootloader_flavor = 'bootloader_flavor: %(bootloader_flavor)s\n'
+    hwpack_initrd_addr = 'initrd_addr: \'%(initrd_addr)s\'\n'
+    hwpack_initrd_high = 'initrd_high: \'%(initrd_high)s\'\n'
+    hwpack_kernel_addr = 'kernel_addr: \'%(kernel_addr)s\'\n'
+    hwpack_load_addr = 'load_addr: \'%(load_addr)s\'\n'
+    hwpack_dtb_addr = 'dtb_addr: \'%(dtb_addr)s\'\n'
+    hwpack_boot_script = 'boot_script: %(boot_script)s\n'
+    hwpack_mmc_option = 'mmc_option: \'%(mmc_option)s\'\n'
+
+    # Some defaults YAML-like strings to use for the tests.
+    android_hwpack_base = (hwpack_format + hwpack_dtb_name)
+    android_hwpack_simple = (android_hwpack_base + hwpack_fdt_high +
+                             hwpack_fat_size)
+    android_hwpack_android_args = (android_hwpack_base + hwpack_android_args)
+    android_hwpack_extra_serial = (android_hwpack_base + hwpack_extra_serial)
+    android_hwpack_extra_boot = (android_hwpack_base + hwpack_extra_boot)
+
+    android_hwpack_panda = (
+        hwpack_format + hwpack_android_args + hwpack_bootloader_flavor +
+        hwpack_dtb_addr + hwpack_dtb_name + hwpack_extra_boot +
+        hwpack_extra_serial
+        )
+
+    android_hwpack_mx6 = (
+        android_hwpack_panda + hwpack_initrd_addr + hwpack_kernel_addr +
+        hwpack_load_addr
+        )
+
+    android_hwpack_snowball_sd = (
+        hwpack_android_args + hwpack_boot_script + hwpack_dtb_addr +
+        hwpack_dtb_name + hwpack_extra_boot + hwpack_extra_serial +
+        hwpack_fdt_high + hwpack_format + hwpack_initrd_addr
+        )
+
+    android_hwpack_snowball_emmc = (
+        android_hwpack_snowball_sd + hwpack_initrd_high + hwpack_mmc_option)
+
+    def setUp(self):
+        super(TestAndroidBoardsHwpack, self).setUp()
+        # Pick a default board.
+        self.config = get_board_config('beagle')
+
+    def _get_tmp_file_name(self, content=None):
+        name = self.useFixture(CreateTempFileFixture(content)).get_file_name()
+        return name
+
+    def assertBootEnv(self, expected, config=None, board='beagle'):
+        """Helper function the boot env parameters.
+
+        :param config: The string containing the YAML configuration.
+        :type str
+        :param expected: The expected configuration.
+        :type dict
+        :param board: The name of the board to test. Defaults to beagle.
+        :type str
+        """
+        board_conf = get_board_config(board)
+        if config:
+            name = self.useFixture(CreateTempFileFixture(config)).\
+                get_file_name()
+            board_conf.from_file(name)
+        self.assertEqual(expected, board_conf._get_boot_env(consoles=[]))
+
+    def test_read_from_file(self):
+        values = {'fdt_high': '0xFFFFFFFF', 'dtb_name': 'a_name'}
+        expected = {'format': 3.0, 'dtb_name': 'a_name',
+                    'fdt_high': '0xFFFFFFFF', 'fat_size': 16}
+        yaml_conf = self.android_hwpack_simple % values
+        name = self._get_tmp_file_name(yaml_conf)
+        conf = self.config.from_file(name)
+        self.assertEqual(expected, conf)
+
+    def test_android_specific_args(self):
+        """The field android_specific_args should be a concatenated string."""
+        values = {'android_specific_args': ['init=/init',
+                                            'androidboot.console=ttyO2'],
+                  'dtb_name': 'a_name'}
+        yaml_conf = self.android_hwpack_android_args % values
+        name = self._get_tmp_file_name(yaml_conf)
+        self.config.from_file(name)
+        expected = 'init=/init androidboot.console=ttyO2'
+        self.assertEqual(expected, self.config.android_specific_args)
+
+    def test_extra_serial_options(self):
+        """The field extra_serial_options should be a concatenated string."""
+        values = {'dtb_name': 'a_name',
+                  'extra_serial_options': ['console=tty0',
+                                           'console=ttyO2,115200n8']}
+        yaml_conf = self.android_hwpack_extra_serial % values
+        name = self._get_tmp_file_name(yaml_conf)
+        self.config.from_file(name)
+        expected = 'console=tty0 console=ttyO2,115200n8'
+        self.assertEqual(expected, self.config.extra_serial_options)
+
+    def test_extra_boot_args_options(self):
+        """The field extra_boot_args_options should be a concatenated string.
+        Testing presence of a field defined in the parent class."""
+        values = {'dtb_name': 'a_name',
+                  'extra_boot_args_options': ['earlyprintk', 'mem=128M@0',
+                                              'mali.mali_mem=64M@128M']
+            }
+        yaml_conf = self.android_hwpack_extra_boot % values
+        name = self._get_tmp_file_name(yaml_conf)
+        self.config.from_file(name)
+        expected = 'earlyprintk mem=128M@0 mali.mali_mem=64M@128M'
+        self.assertEqual(expected, self.config.extra_boot_args_options)
+
+    def test_android_mx6(self):
+        values = {
+            "android_specific_args": ["init=/init", "androidboot.console=%s"],
+            "bootloader_flavor": "mx6qsabrelite",
+            "dtb_addr": '0x11ff0000',
+            "dtb_name": "board.dtb",
+            "extra_boot_args_options": ["earlyprintk", "rootdelay=1",
+                                        "fixrtc", "nocompcache",
+                                        "di1_primary", "tve"],
+            "extra_serial_options": ["console=%s,115200n8"],
+            "initrd_addr": '0x12000000',
+            "kernel_addr": '0x10000000',
+            "load_addr": '0x10008000',
+            }
+        expected = {
+            'bootargs': 'console=ttymxc0,115200n8 '
+                        'rootwait ro earlyprintk rootdelay=1 fixrtc '
+                        'nocompcache di1_primary tve init=/init '
+                        'androidboot.console=ttymxc0',
+            'bootcmd': 'fatload mmc 0:2 0x10000000 uImage; '
+                       'fatload mmc 0:2 0x12000000 uInitrd; '
+                       'fatload mmc 0:2 0x11ff0000 board.dtb; '
+                       'bootm 0x10000000 0x12000000 0x11ff0000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        config = self.android_hwpack_mx6 % values
+        self.assertBootEnv(expected, config=config, board='mx6qsabrelite')
+
+    def test_android_mx6_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=ttymxc0,115200n8 '
+                        'rootwait ro earlyprintk rootdelay=1 fixrtc '
+                        'nocompcache di1_primary tve init=/init '
+                        'androidboot.console=ttymxc0',
+            'bootcmd': 'fatload mmc 0:2 0x10000000 uImage; '
+                       'fatload mmc 0:2 0x12000000 uInitrd; '
+                       'fatload mmc 0:2 0x11ff0000 board.dtb; '
+                       'bootm 0x10000000 0x12000000 0x11ff0000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        self.assertBootEnv(expected, board='mx6qsabrelite')
+
+    def test_panda(self):
+        values = {
+            "android_specific_args": ["init=/init",
+                                      "androidboot.console=ttyO2"],
+            "bootloader_flavor": "omap4_panda",
+            "dtb_addr": '0x815f0000',
+            "dtb_name": "board.dtb",
+            "extra_boot_args_options": ["earlyprintk", "fixrtc",
+                                        "nocompcache", "vram=48M",
+                                        "omapfb.vram=0:24M,1:24M",
+                                        "mem=456M@0x80000000",
+                                        "mem=512M@0xA0000000"],
+            "extra_serial_options": ["console=ttyO2,115200n8"],
+            }
+        expected = {
+            'bootargs': 'console=ttyO2,115200n8 '
+                        'rootwait ro earlyprintk fixrtc '
+                        'nocompcache vram=48M omapfb.vram=0:24M,1:24M '
+                        'mem=456M@0x80000000 mem=512M@0xA0000000 '
+                        'init=/init androidboot.console=ttyO2',
+            'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
+                       'fatload mmc 0:1 0x81600000 uInitrd; '
+                       'fatload mmc 0:1 0x815f0000 board.dtb; '
+                       'bootm 0x80200000 0x81600000 0x815f0000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        config = self.android_hwpack_panda % values
+        self.assertBootEnv(expected, config=config, board='panda')
+
+    def test_panda_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=ttyO2,115200n8 '
+                        'rootwait ro earlyprintk fixrtc '
+                        'nocompcache vram=48M omapfb.vram=0:24M,1:24M '
+                        'mem=456M@0x80000000 mem=512M@0xA0000000 '
+                        'init=/init androidboot.console=ttyO2',
+            'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
+                       'fatload mmc 0:1 0x81600000 uInitrd; '
+                       'fatload mmc 0:1 0x815f0000 board.dtb; '
+                       'bootm 0x80200000 0x81600000 0x815f0000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        self.assertBootEnv(expected, board='panda')
+
+    def test_android_snowball_sd(self):
+        values = {
+            "android_specific_args": ["init=/init",
+                                      "androidboot.console=ttyAMA2"],
+            "boot_script": "boot.scr",
+            "dtb_addr": '0x8000000',
+            "dtb_name": "board.dtb",
+            "extra_boot_args_options": ["earlyprintk", "mem=128M@0",
+                                        "mali.mali_mem=64M@128M",
+                                        "hwmem=168M@192M", "mem=22M@360M",
+                                        "mem_issw=1M@383M", "mem=640M@384M",
+                                        "vmalloc=500M"],
+            "extra_serial_options": ["console=ttyAMA2,115200n8"],
+            "fdt_high": '0x05000000',
+            "initrd_addr": '0x05000000',
+            "initrd_high": '0x06000000',
+            }
+        expected = {
+            'bootargs': 'console=ttyAMA2,115200n8 '
+                        'rootwait ro earlyprintk '
+                        'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
+                        'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
+                        'vmalloc=500M init=/init androidboot.console=ttyAMA2',
+            'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; '
+                       'fatload mmc 1:1 0x05000000 uInitrd; '
+                       'fatload mmc 1:1 0x8000000 board.dtb; '
+                       'bootm 0x00100000 0x05000000 0x8000000',
+            'fdt_high': '0x05000000',
+            'initrd_high': '0x06000000'}
+        config = self.android_hwpack_snowball_sd % values
+        self.assertBootEnv(expected, config=config, board='snowball_sd')
+
+    def test_android_snowball_sd_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=ttyAMA2,115200n8 '
+                        'rootwait ro earlyprintk '
+                        'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
+                        'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
+                        'vmalloc=500M init=/init androidboot.console=ttyAMA2',
+            'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; '
+                       'fatload mmc 1:1 0x05000000 uInitrd; '
+                       'fatload mmc 1:1 0x8000000 board.dtb; '
+                       'bootm 0x00100000 0x05000000 0x8000000',
+            'fdt_high': '0x05000000',
+            'initrd_high': '0x06000000'}
+        self.assertBootEnv(expected, board='snowball_sd')
+
+    def test_android_snowball_emmc(self):
+        values = {
+            "android_specific_args": ["init=/init",
+                                      "androidboot.console=ttyAMA2"],
+            "boot_script": "boot.scr",
+            "dtb_addr": '0x8000000',
+            "dtb_name": "board.dtb",
+            "extra_boot_args_options": ["earlyprintk", "mem=128M@0",
+                                        "mali.mali_mem=64M@128M",
+                                        "hwmem=168M@192M", "mem=22M@360M",
+                                        "mem_issw=1M@383M", "mem=640M@384M",
+                                        "vmalloc=500M"],
+            "extra_serial_options": ["console=ttyAMA2,115200n8"],
+            "fdt_high": '0x05000000',
+            "initrd_addr": '0x05000000',
+            "initrd_high": '0x06000000',
+            "mmc_option": '0:2'
+            }
+        expected = {
+            'bootargs': 'console=ttyAMA2,115200n8 '
+                        'rootwait ro earlyprintk '
+                        'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
+                        'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
+                        'vmalloc=500M init=/init androidboot.console=ttyAMA2',
+            'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; '
+                       'fatload mmc 0:2 0x05000000 uInitrd; '
+                       'fatload mmc 0:2 0x8000000 board.dtb; '
+                       'bootm 0x00100000 0x05000000 0x8000000',
+            'fdt_high': '0x05000000',
+            'initrd_high': '0x06000000'}
+        config = self.android_hwpack_snowball_emmc % values
+        self.assertBootEnv(expected, config, board='snowball_emmc')
+
+    def test_android_snowball_emmc_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=ttyAMA2,115200n8 '
+                        'rootwait ro earlyprintk '
+                        'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
+                        'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
+                        'vmalloc=500M init=/init androidboot.console=ttyAMA2',
+            'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; '
+                       'fatload mmc 0:2 0x05000000 uInitrd; '
+                       'fatload mmc 0:2 0x8000000 board.dtb; '
+                       'bootm 0x00100000 0x05000000 0x8000000',
+            'fdt_high': '0x05000000',
+            'initrd_high': '0x06000000'}
+        self.assertBootEnv(expected, board='snowball_emmc')
+
+    def test_android_origen(self):
+        values = {
+        "extra_serial_options": ["console=tty0", "console=ttySAC2,115200n8"],
+        "android_specific_args": ["init=/init", "androidboot.console=ttySAC2"]
+        }
+        expected = {
+            'bootargs': 'console=tty0 console=ttySAC2,115200n8 '
+                        'rootwait ro init=/init androidboot.console=ttySAC2',
+            'bootcmd': 'fatload mmc 0:2 0x40007000 uImage; '
+                       'fatload mmc 0:2 0x42000000 uInitrd; '
+                       'bootm 0x40007000 0x42000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        config = ((self.hwpack_format + self.hwpack_extra_serial +
+                   self.hwpack_android_args) % values)
+        self.assertBootEnv(expected, config=config, board='origen')
+
+    def test_android_origen_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=tty0 console=ttySAC2,115200n8 '
+                        'rootwait ro init=/init androidboot.console=ttySAC2',
+            'bootcmd': 'fatload mmc 0:2 0x40007000 uImage; '
+                       'fatload mmc 0:2 0x42000000 uInitrd; '
+                       'bootm 0x40007000 0x42000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        self.assertBootEnv(expected, board='origen')
+
+    def test_android_origen_quad(self):
+        values = {
+            "extra_serial_options": ["console=tty0",
+                                     "console=ttySAC2,115200n8"],
+            "android_specific_args": ["init=/init",
+                                      "androidboot.console=ttySAC2"]
+        }
+        expected = {
+            'bootargs': 'console=tty0 console=ttySAC2,115200n8 '
+                        'rootwait ro init=/init androidboot.console=ttySAC2',
+            'bootcmd': 'fatload mmc 0:2 0x40007000 uImage; '
+                       'fatload mmc 0:2 0x42000000 uInitrd; '
+                       'bootm 0x40007000 0x42000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        config = ((self.hwpack_format + self.hwpack_extra_serial +
+                   self.hwpack_android_args) % values)
+        self.assertBootEnv(expected, config=config, board='origen_quad')
+
+    def test_android_origen_quad_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=tty0 console=ttySAC2,115200n8 '
+                        'rootwait ro init=/init androidboot.console=ttySAC2',
+            'bootcmd': 'fatload mmc 0:2 0x40007000 uImage; '
+                       'fatload mmc 0:2 0x42000000 uInitrd; '
+                       'bootm 0x40007000 0x42000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        self.assertBootEnv(expected, board='origen_quad')
+
+    def test_android_vexpress(self):
+        values = {
+            "extra_serial_options": ["console=tty0",
+                                     "console=ttyAMA0,38400n8"],
+            "android_specific_args": ["init=/init",
+                                      "androidboot.console=ttyAMA0"]
+        }
+        expected = {
+            'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
+                        'rootwait ro init=/init androidboot.console=ttyAMA0',
+            'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; '
+                       'fatload mmc 0:1 0x62000000 uInitrd; '
+                       'bootm 0x60000000 0x62000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        config = ((self.hwpack_format + self.hwpack_extra_serial +
+                   self.hwpack_android_args) % values)
+        self.assertBootEnv(expected, config=config, board='vexpress')
+
+    def test_android_vexpress_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
+                        'rootwait ro init=/init androidboot.console=ttyAMA0',
+            'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; '
+                       'fatload mmc 0:1 0x62000000 uInitrd; '
+                       'bootm 0x60000000 0x62000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        self.assertBootEnv(expected, board='vexpress')
+
+    def test_android_mx5(self):
+        values = {
+            "extra_boot_args_options": ["earlyprintk", "rootdelay=1",
+                                        "fixrtc", "nocompcache",
+                                        "di1_primary", "tve"],
+            "extra_serial_options": ["console=%s,115200n8"],
+            "android_specific_args": ["init=/init", "androidboot.console=%s"]
+        }
+        expected = {
+            'bootargs': 'console=ttymxc0,115200n8 '
+                        'rootwait ro earlyprintk rootdelay=1 fixrtc '
+                        'nocompcache di1_primary tve init=/init '
+                        'androidboot.console=ttymxc0',
+            'bootcmd': 'fatload mmc 0:2 0x70000000 uImage; '
+                       'fatload mmc 0:2 0x72000000 uInitrd; '
+                       'bootm 0x70000000 0x72000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        config = ((self.hwpack_format + self.hwpack_extra_boot +
+                   self.hwpack_extra_serial + self.hwpack_android_args) %
+                   values)
+        self.assertBootEnv(expected, config=config, board='mx53loco')
+
+    def test_android_mx5_old(self):
+        # Old test: use the values from the class, instead of passing them.
+        expected = {
+            'bootargs': 'console=ttymxc0,115200n8 '
+                        'rootwait ro earlyprintk rootdelay=1 fixrtc '
+                        'nocompcache di1_primary tve init=/init '
+                        'androidboot.console=ttymxc0',
+            'bootcmd': 'fatload mmc 0:2 0x70000000 uImage; '
+                       'fatload mmc 0:2 0x72000000 uInitrd; '
+                       'bootm 0x70000000 0x72000000',
+            'fdt_high': '0xffffffff',
+            'initrd_high': '0xffffffff'}
+        self.assertBootEnv(expected, board='mx53loco')

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2012-12-23 12:49:02 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2013-01-03 13:57:23 +0000
@@ -32,6 +32,7 @@
 import tarfile
 import dbus
 
+from mock import MagicMock
 from StringIO import StringIO
 from testtools import TestCase
 
@@ -50,7 +51,6 @@
     SECTOR_SIZE,
     align_up,
     align_partition,
-    board_configs,
     get_plain_boot_script_contents,
     make_flashable_env,
     install_mx5_boot_loader,
@@ -63,10 +63,10 @@
     _get_mlo_file,
     _run_mkimage,
     BoardConfig,
+    get_board_config,
     )
 from linaro_image_tools.media_create.android_boards import (
     AndroidSnowballEmmcConfig,
-    android_board_configs,
     )
 from linaro_image_tools.media_create.chroot_utils import (
     copy_file,
@@ -203,7 +203,7 @@
         return tarball
 
     def test_get_format_1(self):
-        data = '1.0'
+        data = HardwarepackHandler.FORMAT_1
         format = "%s\n" % data
         tarball = self.add_to_tarball(
             [('FORMAT', format), ('metadata', self.metadata)])
@@ -230,8 +230,8 @@
             self.assertRaises(AssertionError, hp.get_format)
 
     def test_mixed_formats(self):
-        format1 = "%s\n" % '1.0'
-        format2 = "%s\n" % '2.0'
+        format1 = "%s\n" % HardwarepackHandler.FORMAT_1
+        format2 = "%s\n" % HardwarepackHandler.FORMAT_2
         tarball1 = self.add_to_tarball(
             [('FORMAT', format1), ('metadata', self.metadata)],
             tarball=self.tarball_fixture.get_tarball())
@@ -247,8 +247,8 @@
             self.assertEquals(hp.get_format(), '1.0and2.0')
 
     def test_identical_formats_ok(self):
-        format1 = "%s\n" % '2.0'
-        format2 = "%s\n" % '2.0'
+        format1 = "%s\n" % HardwarepackHandler.FORMAT_2
+        format2 = "%s\n" % HardwarepackHandler.FORMAT_2
         tarball1 = self.add_to_tarball(
             [('FORMAT', format1), ('metadata', self.metadata)],
             tarball=self.tarball_fixture.get_tarball())
@@ -427,10 +427,9 @@
                 linaro_image_tools.media_create.boards, 'HardwarepackHandler',
                 self.MockHardwarepackHandler))
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(None, config.kernel_addr)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(None, board_conf.kernel_addr)
 
     def test_sets_kernel_addr(self):
         self.useFixture(MockSomethingFixture(
@@ -442,10 +441,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.kernel_addr)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.kernel_addr)
 
     def test_sets_initrd_addr(self):
         self.useFixture(MockSomethingFixture(
@@ -457,10 +455,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.initrd_addr)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.initrd_addr)
 
     def test_sets_load_addr(self):
         self.useFixture(MockSomethingFixture(
@@ -472,10 +469,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.load_addr)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.load_addr)
 
     def test_sets_serial_tty(self):
         self.useFixture(MockSomethingFixture(
@@ -487,10 +483,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.serial_tty)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.serial_tty)
 
     def test_sets_wired_interfaces(self):
         self.useFixture(MockSomethingFixture(
@@ -502,10 +497,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.wired_interfaces)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.wired_interfaces)
 
     def test_sets_wireless_interfaces(self):
         self.useFixture(MockSomethingFixture(
@@ -517,10 +511,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.wireless_interfaces)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.wireless_interfaces)
 
     def test_sets_mmc_id(self):
         self.useFixture(MockSomethingFixture(
@@ -532,12 +525,11 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.mmc_option)
-        self.assertEquals(0, config.mmc_device_id)
-        self.assertEquals(0, config.mmc_part_offset)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.mmc_option)
+        self.assertEquals(0, board_conf.mmc_device_id)
+        self.assertEquals(0, board_conf.mmc_part_offset)
 
     def test_sets_boot_min_size(self):
         self.useFixture(MockSomethingFixture(
@@ -551,10 +543,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(expected, config.BOOT_MIN_SIZE_S)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(expected, board_conf.BOOT_MIN_SIZE_S)
 
     def test_sets_root_min_size(self):
         self.useFixture(MockSomethingFixture(
@@ -568,10 +559,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(expected, config.ROOT_MIN_SIZE_S)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(expected, board_conf.ROOT_MIN_SIZE_S)
 
     def test_sets_loader_min_size(self):
         self.useFixture(MockSomethingFixture(
@@ -585,10 +575,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(expected, config.LOADER_MIN_SIZE_S)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(expected, board_conf.LOADER_MIN_SIZE_S)
 
     def test_sets_partition_layout_32(self):
         self.useFixture(MockSomethingFixture(
@@ -600,10 +589,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(32, config.fat_size)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(32, board_conf.fat_size)
 
     def test_sets_partition_layout_16(self):
         self.useFixture(MockSomethingFixture(
@@ -615,10 +603,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(16, config.fat_size)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(16, board_conf.fat_size)
 
     def test_sets_partition_layout_raises(self):
         self.useFixture(MockSomethingFixture(
@@ -630,10 +617,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
+        board_conf = BoardConfig()
         self.assertRaises(
-            AssertionError, config.set_metadata, 'ahwpack.tar.gz')
+            AssertionError, board_conf.set_metadata, 'ahwpack.tar.gz')
 
     def test_sets_copy_files(self):
         self.useFixture(MockSomethingFixture(
@@ -647,10 +633,9 @@
             field_to_test: data_to_set,
             }
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata('ahwpack.tar.gz')
-        self.assertEquals(data_to_set, config.bootloader_copy_files)
+        board_conf = BoardConfig()
+        board_conf.set_metadata('ahwpack.tar.gz')
+        self.assertEquals(data_to_set, board_conf.bootloader_copy_files)
 
 
 class TestGetMLOFile(TestCaseWithFixtures):
@@ -697,7 +682,10 @@
 
 
 class TestGetSMDKSPL(TestCaseWithFixtures):
-    config = boards.SMDKV310Config
+    def setUp(self):
+            super(TestGetSMDKSPL, self).setUp()
+            self.config = boards.SMDKV310Config()
+            self.config.hwpack_format = HardwarepackHandler.FORMAT_1
 
     def test_no_file_present(self):
         tempdir = self.useFixture(CreateTempDirFixture()).get_temp_dir()
@@ -729,7 +717,10 @@
 
 
 class TestGetSMDKUboot(TestCaseWithFixtures):
-    config = boards.SMDKV310Config
+    def setUp(self):
+        super(TestGetSMDKUboot, self).setUp()
+        self.config = boards.SMDKV310Config()
+        self.config.hwpack_format = HardwarepackHandler.FORMAT_1
 
     def test_uses_uboot_flavour(self):
         chroot_dir = "chroot"
@@ -740,7 +731,10 @@
 
 
 class TestGetOrigenSPL(TestCaseWithFixtures):
-    config = boards.OrigenConfig
+    def setUp(self):
+        super(TestGetOrigenSPL, self).setUp()
+        self.config = boards.OrigenConfig()
+        self.config.hwpack_format = HardwarepackHandler.FORMAT_1
 
     def test_no_file_present(self):
         tempdir = self.useFixture(CreateTempDirFixture()).get_temp_dir()
@@ -756,11 +750,17 @@
 
 
 class TestGetOrigenUboot(TestGetSMDKUboot):
-    config = boards.OrigenConfig
+    def setUp(self):
+        super(TestGetOrigenUboot, self).setUp()
+        self.config = boards.OrigenConfig()
+        self.config.hwpack_format = HardwarepackHandler.FORMAT_1
 
 
 class TestGetOrigenQuadSPL(TestCaseWithFixtures):
-    config = boards.OrigenQuadConfig
+    def setUp(self):
+        super(TestGetOrigenQuadSPL, self).setUp()
+        self.config = boards.OrigenQuadConfig()
+        self.config.hwpack_format = HardwarepackHandler.FORMAT_1
 
     def test_no_file_present(self):
         tempdir = self.useFixture(CreateTempDirFixture()).get_temp_dir()
@@ -776,11 +776,17 @@
 
 
 class TestGetOrigenQuadUboot(TestGetSMDKUboot):
-    config = boards.OrigenQuadConfig
+    def setUp(self):
+        super(TestGetOrigenQuadUboot, self).setUp()
+        self.config = boards.OrigenQuadConfig()
+        self.config.hwpack_format = HardwarepackHandler.FORMAT_1
 
 
 class TestGetArndaleSPL(TestCaseWithFixtures):
-    config = boards.ArndaleConfig
+    def setUp(self):
+        super(TestGetArndaleSPL, self).setUp()
+        self.config = boards.ArndaleConfig()
+        self.config.hwpack_format = HardwarepackHandler.FORMAT_1
 
     def test_no_file_present(self):
         tempdir = self.useFixture(CreateTempDirFixture()).get_temp_dir()
@@ -818,6 +824,7 @@
                  '\x05\x00\x00\x00' '\x05\x00\x00\x00' \
                  'hello' + zero + '\x00\x00\x00'
         self.expected = line1 + line2 + line3
+        self.board_conf = boards.SnowballEmmcConfig()
 
     def create_files_structure(self, src_data):
         ''' Creates the data structure that the tested function
@@ -841,7 +848,7 @@
         files = self.create_files_structure(correct_data)
         filename = os.path.join(self.tempdir, 'toc')
         with open(filename, 'w') as f:
-            boards.SnowballEmmcConfig.create_toc(f, files)
+            self.board_conf.create_toc(f, files)
         with open(filename, 'r') as f:
             actual = f.read()
         self.assertEquals(96, len(actual))
@@ -856,7 +863,7 @@
         files = self.create_files_structure(illegal_name_data)
         with open(os.path.join(self.tempdir, 'toc'), 'w') as f:
             self.assertRaises(AssertionError,
-                              boards.SnowballEmmcConfig.create_toc,
+                              self.board_conf.create_toc,
                               f, files)
 
     def test_create_toc_error_negative_unsigned(self):
@@ -866,7 +873,7 @@
         files = self.create_files_structure(illegal_unsigned_data)
         with open(os.path.join(self.tempdir, 'toc'), 'w') as f:
             self.assertRaises(struct.error,
-                              boards.SnowballEmmcConfig.create_toc,
+                              self.board_conf.create_toc,
                               f, files)
 
 
@@ -885,6 +892,8 @@
             os.makedirs(self.temp_bootdir_path)
         if not os.path.exists(self.temp_configdir_path):
             os.makedirs(self.temp_configdir_path)
+        self.snowball_config = get_board_config('snowball_emmc')
+        self.snowball_config.hwpack_format = HardwarepackHandler.FORMAT_1
 
     def setupFiles(self):
         return self.create_test_files(self.temp_bootdir_path)
@@ -910,7 +919,7 @@
                     ('UBOOT_ENV', 'u-boot-env.bin', 0, 0x00C1F000, '10')]
         # Create a config file
         cfg_file = os.path.join(
-            path, boards.SnowballEmmcConfig.snowball_startup_files_config)
+            path, self.snowball_config.snowball_startup_files_config)
         with open(cfg_file, 'w') as f:
             for line in src_data:
                 # Write comments, so we test that the parser can read them
@@ -926,8 +935,8 @@
                 f.write(line[0])
         #define the expected values read from the config file
         expected = []
-        ofs = [boards.SnowballEmmcConfig.TOC_SIZE,
-               boards.SnowballEmmcConfig.TOC_SIZE + len('ISSW'), 0x160000,
+        ofs = [self.snowball_config.TOC_SIZE,
+               self.snowball_config.TOC_SIZE + len('ISSW'), 0x160000,
                0x170000, 0xBA0000, 0xC1F000]
         size = [len('ISSW'), len('X-LOADER'), len('MEM_INIT'), \
                 len('PWR_MGT'), len('NORMAL'), len('UBOOT_ENV')]
@@ -946,13 +955,13 @@
     def test_get_file_info_relative_path(self):
         # Create a config file
         cfg_file = os.path.join(self.temp_bootdir_path,
-                      boards.SnowballEmmcConfig.snowball_startup_files_config)
+                      self.snowball_config.snowball_startup_files_config)
         uboot_file = 'u-boot.bin'
         with open(cfg_file, 'w') as f:
                 f.write('%s %s %i %#x %s\n' % ('NORMAL', uboot_file, 0,
                                                0xBA0000, '9'))
         with open(os.path.join(self.temp_bootdir_path, uboot_file), 'w') as f:
-            file_info = boards.SnowballEmmcConfig.get_file_info(
+            file_info = self.snowball_config.get_file_info(
                 self.tempdir, self.temp_bootdir_path)
         self.assertEquals(file_info[0]['filename'],
                           os.path.join(self.temp_bootdir_path, uboot_file))
@@ -960,7 +969,7 @@
     def test_get_file_info_abs_path(self):
         # Create a config file
         cfg_file = os.path.join(self.temp_bootdir_path,
-                      boards.SnowballEmmcConfig.snowball_startup_files_config)
+                      self.snowball_config.snowball_startup_files_config)
         uboot_dir = tempfile.mkdtemp(dir=self.tempdir)
         uboot_file = os.path.join(uboot_dir, 'u-boot.bin')
         uboot_relative_file = uboot_file.replace(self.tempdir, '')
@@ -968,19 +977,19 @@
                 f.write('%s %s %i %#x %s\n' % (
                         'NORMAL', uboot_relative_file, 0, 0xBA0000, '9'))
         with open(uboot_file, 'w') as f:
-            file_info = boards.SnowballEmmcConfig.get_file_info(
+            file_info = self.snowball_config.get_file_info(
                 self.tempdir, self.temp_bootdir_path)
         self.assertEquals(file_info[0]['filename'], uboot_file)
 
     def test_get_file_info_raises(self):
         # Create a config file
         cfg_file = os.path.join(self.temp_bootdir_path,
-                      boards.SnowballEmmcConfig.snowball_startup_files_config)
+                      self.snowball_config.snowball_startup_files_config)
         with open(cfg_file, 'w') as f:
                 f.write('%s %s %i %#x %s\n' % ('NORMAL', 'u-boot.bin', 0,
                                                0xBA0000, '9'))
         self.assertRaises(
-            AssertionError, boards.SnowballEmmcConfig.get_file_info,
+            AssertionError, self.snowball_config.get_file_info,
             self.tempdir, self.temp_bootdir_path)
 
     def test_file_name_size(self):
@@ -988,28 +997,28 @@
         _, toc_filename = tempfile.mkstemp()
         atexit.register(os.unlink, toc_filename)
         filedata = 'X'
-        bytes = boards.SnowballEmmcConfig.TOC_SIZE + 1
+        bytes = self.snowball_config.TOC_SIZE + 1
         tmpfile = open(toc_filename, 'wb')
         for n in xrange(bytes):
             tmpfile.write(filedata)
         tmpfile.close()
         files = self.setupFiles()
         self.assertRaises(AssertionError,
-            boards.SnowballEmmcConfig.install_snowball_boot_loader,
+            self.snowball_config.install_snowball_boot_loader,
             toc_filename, files, "boot_device_or_file",
-            boards.SnowballEmmcConfig.SNOWBALL_LOADER_START_S)
+            self.snowball_config.SNOWBALL_LOADER_START_S)
 
     def test_install_snowball_boot_loader_toc_dont_delete(self):
         fixture = self.useFixture(MockCmdRunnerPopenFixture())
         toc_filename = self.createTempFileAsFixture()
         files = self.setupFiles()
-        boards.SnowballEmmcConfig.install_snowball_boot_loader(toc_filename,
+        self.snowball_config.install_snowball_boot_loader(toc_filename,
             files, "boot_device_or_file",
-            boards.SnowballEmmcConfig.SNOWBALL_LOADER_START_S)
+            self.snowball_config.SNOWBALL_LOADER_START_S)
         expected = [
             '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc' \
             ' seek=%s' % (sudo_args, toc_filename,
-            boards.SnowballEmmcConfig.SNOWBALL_LOADER_START_S),
+            self.snowball_config.SNOWBALL_LOADER_START_S),
             '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512' \
             ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
             '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file' \
@@ -1030,13 +1039,13 @@
         fixture = self.useFixture(MockCmdRunnerPopenFixture())
         toc_filename = self.createTempFileAsFixture()
         files = self.setupFiles()
-        boards.SnowballEmmcConfig.install_snowball_boot_loader(toc_filename,
+        self.snowball_config.install_snowball_boot_loader(toc_filename,
             files, "boot_device_or_file",
-            boards.SnowballEmmcConfig.SNOWBALL_LOADER_START_S, True)
+            self.snowball_config.SNOWBALL_LOADER_START_S, True)
         expected = [
             '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc' \
             ' seek=%s' % (sudo_args, toc_filename,
-            boards.SnowballEmmcConfig.SNOWBALL_LOADER_START_S),
+            self.snowball_config.SNOWBALL_LOADER_START_S),
             '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512' \
             ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
             '%s rm %s/boot_image_issw.bin' % (sudo_args,
@@ -1066,13 +1075,14 @@
         fixture = self.useFixture(MockCmdRunnerPopenFixture())
         toc_filename = self.createTempFileAsFixture()
         files = self.setupFiles()
-        AndroidSnowballEmmcConfig.install_snowball_boot_loader(
+        board_conf = AndroidSnowballEmmcConfig()
+        board_conf.install_snowball_boot_loader(
             toc_filename, files, "boot_device_or_file",
-            AndroidSnowballEmmcConfig.SNOWBALL_LOADER_START_S)
+            board_conf.SNOWBALL_LOADER_START_S)
         expected = [
             '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc' \
             ' seek=%s' % (sudo_args, toc_filename,
-            AndroidSnowballEmmcConfig.SNOWBALL_LOADER_START_S),
+            board_conf.SNOWBALL_LOADER_START_S),
             '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512' \
             ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
             '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file' \
@@ -1097,11 +1107,11 @@
         k_img_file = os.path.join(self.tempdir, 'vmlinuz-1-ux500')
         i_img_file = os.path.join(self.tempdir, 'initrd.img-1-ux500')
 
-        boot_env = board_configs['snowball_emmc']._get_boot_env(
+        boot_env = self.snowball_config._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_id="UUID=test_boot_env_uuid",
             i_img_data=None, d_img_data=None)
-        boards.SnowballEmmcConfig._make_boot_files(boot_env, self.tempdir,
+        self.snowball_config._make_boot_files(boot_env, self.tempdir,
             self.temp_bootdir_path, 'boot_device_or_file', k_img_file,
             i_img_file, None)
         expected = [
@@ -1145,12 +1155,12 @@
     def test_missing_files(self):
         '''When the files cannot be read, an IOError should be raised'''
         self.assertRaises(IOError,
-                          boards.SnowballEmmcConfig.get_file_info,
+                          self.snowball_config.get_file_info,
                           self.tempdir, self.temp_bootdir_path)
 
     def test_normal_case(self):
         expected = self.setupFiles()
-        actual = boards.SnowballEmmcConfig.get_file_info(
+        actual = self.snowball_config.get_file_info(
             self.tempdir, self.temp_bootdir_path)
         self.assertEquals(expected, actual)
 
@@ -1161,8 +1171,6 @@
         super(TestBootSteps, self).setUp()
         self.funcs_calls = []
         self.mock_all_boards_funcs()
-        boards = linaro_image_tools.media_create.boards
-        boards.BoardConfig.hwpack_format = '1.0'
 
     def mock_all_boards_funcs(self):
         """Mock functions of boards module with a call tracer."""
@@ -1179,169 +1187,174 @@
 
     def mock_set_appropriate_serial_tty(self, config):
 
-        def set_appropriate_serial_tty_mock(cls, chroot_dir):
-            cls.serial_tty = cls._serial_tty
+        def set_appropriate_serial_tty_mock(chroot_dir):
+            config.serial_tty = config._serial_tty
 
-        self.useFixture(MockSomethingFixture(
-            config, 'set_appropriate_serial_tty',
-            classmethod(set_appropriate_serial_tty_mock)))
+        config.set_appropriate_serial_tty = MagicMock(
+            side_effect=set_appropriate_serial_tty_mock)
 
     def make_boot_files(self, config):
-        def _get_kflavor_files_mock(cls, path):
-            if cls.dtb_name is None:
+        def _get_kflavor_files_mock(path):
+            if config.dtb_name is None:
                 return (path, path, None)
             return (path, path, path)
 
-        self.useFixture(MockSomethingFixture(
-            config, '_get_kflavor_files',
-            classmethod(_get_kflavor_files_mock)))
+        config._get_kflavor_files = MagicMock(
+            side_effect=_get_kflavor_files_mock)
 
         config.make_boot_files('', False, False, [], '', '', '', '')
 
     def test_vexpress_steps(self):
-        self.make_boot_files(boards.VexpressConfig)
+        board_conf = boards.VexpressConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.make_boot_files(board_conf)
         expected = ['make_uImage', 'make_uInitrd']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_vexpress_a9_steps(self):
-        self.make_boot_files(boards.VexpressA9Config)
+        board_conf = boards.VexpressA9Config()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.make_boot_files(board_conf)
         expected = ['make_uImage', 'make_uInitrd']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_mx5_steps(self):
-        class SomeMx5Config(boards.Mx5Config):
-            bootloader_flavor = 'bootloader_flavor'
-        SomeMx5Config.hardwarepack_handler = (
+        board_conf = boards.Mx5Config()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.bootloader_flavor = 'bootloader_flavor'
+        board_conf.hardwarepack_handler = (
             TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        SomeMx5Config.hardwarepack_handler.get_format = (
-            lambda: '1.0')
-        self.make_boot_files(SomeMx5Config)
+        board_conf.hardwarepack_handler.get_format = (
+            lambda: HardwarepackHandler.FORMAT_1)
+        self.make_boot_files(board_conf)
         expected = [
             'install_mx5_boot_loader', 'make_uImage', 'make_uInitrd',
             'make_dtb', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_smdkv310_steps(self):
-        def mock_func_creator(name):
-            return classmethod(
-                lambda *args, **kwargs: self.funcs_calls.append(name))
-
-        self.useFixture(MockSomethingFixture(
-                linaro_image_tools.media_create.boards.SMDKV310Config,
-                'install_samsung_boot_loader',
-                mock_func_creator('install_samsung_boot_loader')))
+        board_conf = boards.SMDKV310Config()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.install_samsung_boot_loader = MagicMock()
+        board_conf.install_samsung_boot_loader.return_value = \
+            self.funcs_calls.append('install_samsung_boot_loader')
         self.useFixture(MockSomethingFixture(os.path, 'exists',
                                              lambda file: True))
-        boards.SMDKV310Config.hardwarepack_handler = (
+        board_conf.hardwarepack_handler = (
             TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        boards.SMDKV310Config.hardwarepack_handler.get_format = (
-            lambda: '1.0')
-        self.make_boot_files(boards.SMDKV310Config)
+        board_conf.hardwarepack_handler.get_format = (
+            lambda: HardwarepackHandler.FORMAT_1)
+        self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
             'make_uImage', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_origen_steps(self):
-        def mock_func_creator(name):
-            return classmethod(
-                lambda *args, **kwargs: self.funcs_calls.append(name))
-
-        self.useFixture(MockSomethingFixture(
-                linaro_image_tools.media_create.boards.OrigenConfig,
-                'install_samsung_boot_loader',
-                mock_func_creator('install_samsung_boot_loader')))
+        board_conf = boards.OrigenConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.install_samsung_boot_loader = MagicMock()
+        board_conf.install_samsung_boot_loader.return_value = \
+            self.funcs_calls.append('install_samsung_boot_loader')
         self.useFixture(MockSomethingFixture(os.path, 'exists',
                                              lambda file: True))
-        boards.OrigenConfig.hardwarepack_handler = (
+        board_conf.hardwarepack_handler = (
             TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        boards.OrigenConfig.hardwarepack_handler.get_format = (
-            lambda: '1.0')
-        self.make_boot_files(boards.OrigenConfig)
+        board_conf.hardwarepack_handler.get_format = (
+            lambda: HardwarepackHandler.FORMAT_1)
+        self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
             'make_uImage', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_origen_quad_steps(self):
-        def mock_func_creator(name):
-            return classmethod(
-                lambda *args, **kwargs: self.funcs_calls.append(name))
+        board_conf = boards.OrigenQuadConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.install_samsung_boot_loader = MagicMock()
+        board_conf.install_samsung_boot_loader.return_value = \
+            self.funcs_calls.append('install_samsung_boot_loader')
 
-        self.useFixture(MockSomethingFixture(
-                linaro_image_tools.media_create.boards.OrigenQuadConfig,
-                'install_samsung_boot_loader',
-                mock_func_creator('install_samsung_boot_loader')))
         self.useFixture(MockSomethingFixture(os.path, 'exists',
                                              lambda file: True))
-        boards.OrigenQuadConfig.hardwarepack_handler = (
+        board_conf.hardwarepack_handler = (
             TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        boards.OrigenQuadConfig.hardwarepack_handler.get_format = (
-            lambda: '1.0')
-        self.make_boot_files(boards.OrigenQuadConfig)
+        board_conf.hardwarepack_handler.get_format = (
+            lambda: HardwarepackHandler.FORMAT_1)
+        self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
             'make_uImage', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_arndale_steps(self):
-        def mock_func_creator(name):
-            return classmethod(
-                lambda *args, **kwargs: self.funcs_calls.append(name))
+        board_conf = boards.ArndaleConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.install_samsung_boot_loader = MagicMock()
+        board_conf.install_samsung_boot_loader.return_value = \
+            self.funcs_calls.append('install_samsung_boot_loader')
 
-        self.useFixture(MockSomethingFixture(
-            linaro_image_tools.media_create.boards.ArndaleConfig,
-            'install_samsung_boot_loader',
-            mock_func_creator('install_samsung_boot_loader')))
         self.useFixture(MockSomethingFixture(os.path, 'exists',
             lambda file: True))
-        boards.ArndaleConfig.hardwarepack_handler = (
+        board_conf.hardwarepack_handler = (
             TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        boards.ArndaleConfig.hardwarepack_handler.get_format = (
+        board_conf.hardwarepack_handler.get_format = (
             lambda: '1.0')
-        self.make_boot_files(boards.ArndaleConfig)
+        self.make_boot_files(board_conf)
         expected = [
             'install_samsung_boot_loader', 'make_flashable_env', '_dd',
             'make_uImage', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_ux500_steps(self):
-        self.make_boot_files(boards.Ux500Config)
+        board_conf = boards.Ux500Config()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.make_boot_files(board_conf)
         expected = ['make_uImage', 'make_uInitrd', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_snowball_sd_steps(self):
-        self.make_boot_files(boards.SnowballSdConfig)
+        board_conf = boards.SnowballSdConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.make_boot_files(board_conf)
         expected = ['make_uImage', 'make_boot_script']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_panda_steps(self):
-        self.mock_set_appropriate_serial_tty(boards.PandaConfig)
-        self.make_boot_files(boards.PandaConfig)
+        board_conf = boards.PandaConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.mock_set_appropriate_serial_tty(board_conf)
+        self.make_boot_files(board_conf)
         expected = [
             'install_omap_boot_loader', 'make_uImage', 'make_uInitrd',
             'make_dtb', 'make_boot_script', 'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_beagle_steps(self):
-        self.mock_set_appropriate_serial_tty(boards.BeagleConfig)
-        self.make_boot_files(boards.BeagleConfig)
+        board_conf = boards.BeagleConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.mock_set_appropriate_serial_tty(board_conf)
+        self.make_boot_files(board_conf)
         expected = [
             'install_omap_boot_loader', 'make_uImage', 'make_uInitrd',
             'make_dtb', 'make_boot_script', 'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_igep_steps(self):
-        self.mock_set_appropriate_serial_tty(boards.IgepConfig)
-        self.make_boot_files(boards.IgepConfig)
+        board_conf = boards.IgepConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.mock_set_appropriate_serial_tty(board_conf)
+        self.make_boot_files(board_conf)
         expected = [
             'make_uImage', 'make_uInitrd', 'make_dtb', 'make_boot_script',
             'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_overo_steps(self):
-        self.mock_set_appropriate_serial_tty(boards.OveroConfig)
-        self.make_boot_files(boards.OveroConfig)
+        board_conf = boards.OveroConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.mock_set_appropriate_serial_tty(board_conf)
+        self.make_boot_files(board_conf)
         expected = [
             'install_omap_boot_loader', 'make_uImage', 'make_uInitrd',
             'make_dtb', 'make_boot_script', 'make_boot_ini']
@@ -1373,20 +1386,20 @@
 
     def test_snowball_config_raises(self):
         self.assertRaises(NotImplementedError,
-                          boards.SnowballSdConfig.snowball_config, '')
+                          boards.SnowballSdConfig().snowball_config, '')
 
     def test_beagle_raw(self):
-        self.populate_raw_partition(android_boards.AndroidBeagleConfig)
+        self.populate_raw_partition(android_boards.AndroidBeagleConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
     def test_panda_raw(self):
-        self.populate_raw_partition(android_boards.AndroidPandaConfig)
+        self.populate_raw_partition(android_boards.AndroidPandaConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
     def test_snowball_sd_raw(self):
-        self.populate_raw_partition(boards.SnowballSdConfig)
+        self.populate_raw_partition(boards.SnowballSdConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1411,7 +1424,7 @@
                 linaro_image_tools.media_create.boards.SnowballEmmcConfig,
                 'delete_file',
                 mock_func_creator('delete_file')))
-        self.populate_raw_partition(boards.SnowballEmmcConfig)
+        self.populate_raw_partition(boards.SnowballEmmcConfig())
         expected = ['get_file_info', 'create_toc',
                     'install_snowball_boot_loader', 'delete_file',
                     'delete_file']
@@ -1423,12 +1436,12 @@
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
 
-        self.populate_raw_partition(boards.SMDKV310Config)
+        self.populate_raw_partition(boards.SMDKV310Config())
         expected = ['_dd', '_dd', '_dd']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_mx53loco_raw(self):
-        self.populate_raw_partition(boards.Mx53LoCoConfig)
+        self.populate_raw_partition(boards.Mx53LoCoConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1436,7 +1449,7 @@
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
 
-        self.populate_raw_partition(boards.OrigenConfig)
+        self.populate_raw_partition(boards.OrigenConfig())
         expected = ['_dd', '_dd', '_dd']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1444,7 +1457,7 @@
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
 
-        self.populate_raw_partition(boards.OrigenQuadConfig)
+        self.populate_raw_partition(boards.OrigenQuadConfig())
         expected = ['_dd', '_dd', '_dd']
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1452,12 +1465,12 @@
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
             lambda file: 1))
 
-        self.populate_raw_partition(boards.ArndaleConfig)
+        self.populate_raw_partition(boards.ArndaleConfig())
         expected = ['_dd', '_dd', '_dd']
         self.assertEqual(expected, self.funcs_calls)
 
     def test_vexpress_a9_raw(self):
-        self.populate_raw_partition(boards.VexpressA9Config)
+        self.populate_raw_partition(boards.VexpressA9Config())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1472,17 +1485,17 @@
         config.populate_raw_partition('', '')
 
     def test_beagle_raw(self):
-        self.populate_raw_partition(android_boards.AndroidBeagleConfig)
+        self.populate_raw_partition(android_boards.AndroidBeagleConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
     def test_panda_raw(self):
-        self.populate_raw_partition(android_boards.AndroidPandaConfig)
+        self.populate_raw_partition(android_boards.AndroidPandaConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
     def test_snowball_sd_raw(self):
-        self.populate_raw_partition(android_boards.AndroidSnowballSdConfig)
+        self.populate_raw_partition(android_boards.AndroidSnowballSdConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1513,7 +1526,7 @@
                 android_boards.AndroidSnowballEmmcConfig,
                 'delete_file',
                 mock_func_creator('delete_file')))
-        self.populate_raw_partition(android_boards.AndroidSnowballEmmcConfig)
+        self.populate_raw_partition(android_boards.AndroidSnowballEmmcConfig())
         expected_calls = ['get_file_info', 'create_toc',
                     'install_snowball_boot_loader', 'delete_file']
         # Test that we copy the u-boot files to the local startupfiles dir.
@@ -1533,14 +1546,14 @@
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
 
-        self.populate_raw_partition(android_boards.AndroidSMDKV310Config)
+        self.populate_raw_partition(android_boards.AndroidSMDKV310Config())
         expected_calls = []
         # Test that we dd the files
         self.assertEqual(expected_commands, fixture.mock.commands_executed)
         self.assertEqual(expected_calls, self.funcs_calls)
 
     def test_mx53loco_raw(self):
-        self.populate_raw_partition(android_boards.AndroidMx53LoCoConfig)
+        self.populate_raw_partition(android_boards.AndroidMx53LoCoConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1555,7 +1568,7 @@
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
 
-        self.populate_raw_partition(android_boards.AndroidOrigenConfig)
+        self.populate_raw_partition(android_boards.AndroidOrigenConfig())
         expected = []
         # Test that we dd the files
         self.assertEqual(expected_commands, fixture.mock.commands_executed)
@@ -1573,14 +1586,14 @@
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
 
-        self.populate_raw_partition(android_boards.AndroidOrigenQuadConfig)
+        self.populate_raw_partition(android_boards.AndroidOrigenQuadConfig())
         expected = []
         # Test that we dd the files
         self.assertEqual(expected_commands, fixture.mock.commands_executed)
         self.assertEqual(expected, self.funcs_calls)
 
     def test_vexpress_raw(self):
-        self.populate_raw_partition(android_boards.AndroidVexpressConfig)
+        self.populate_raw_partition(android_boards.AndroidVexpressConfig())
         expected = []
         self.assertEqual(expected, self.funcs_calls)
 
@@ -1611,25 +1624,29 @@
 
     def mock_set_appropriate_serial_tty(self, config):
 
-        def set_appropriate_serial_tty_mock(cls, chroot_dir):
+        def set_appropriate_serial_tty_mock(arg):
             self.set_appropriate_serial_tty_called = True
-            cls.serial_tty = cls._serial_tty
 
-        self.useFixture(MockSomethingFixture(
-            config, 'set_appropriate_serial_tty',
-            classmethod(set_appropriate_serial_tty_mock)))
+        # Need to mock all the calls done from make_boot_files in order
+        # to be able to correctly call it.
+        config._get_kflavor_files = MagicMock(return_value=('', '', ''))
+        config._get_boot_env = MagicMock(return_value=None)
+        config._make_boot_files = MagicMock()
+        config._make_boot_files_v2 = MagicMock()
+        config.set_appropriate_serial_tty = MagicMock(
+             side_effect=set_appropriate_serial_tty_mock)
 
     def test_omap_make_boot_files(self):
         self.set_appropriate_serial_tty_called = False
-        self.mock_set_appropriate_serial_tty(board_configs['beagle'])
-        self.useFixture(MockSomethingFixture(
-            boards.BoardConfig, 'make_boot_files',
-            classmethod(lambda *args: None)))
+
+        board_conf = boards.BeagleConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        self.mock_set_appropriate_serial_tty(board_conf)
         # We don't need to worry about what's passed to make_boot_files()
         # because we mock the method which does the real work above and here
         # we're only interested in ensuring that OmapConfig.make_boot_files()
         # calls set_appropriate_serial_tty().
-        board_configs['beagle'].make_boot_files(
+        board_conf.make_boot_files(
             None, None, None, None, None, None, None, None)
         self.assertTrue(
             self.set_appropriate_serial_tty_called,
@@ -1638,17 +1655,14 @@
     def test_omap_make_boot_files_v2(self):
         self.set_appropriate_serial_tty_called = False
 
-        class config(boards.BeagleConfig):
-            hwpack_format = HardwarepackHandler.FORMAT_2
-        self.mock_set_appropriate_serial_tty(config)
-        self.useFixture(MockSomethingFixture(
-            boards.BoardConfig, 'make_boot_files',
-            classmethod(lambda *args: None)))
+        board_conf = boards.BeagleConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_2
+        self.mock_set_appropriate_serial_tty(board_conf)
         # We don't need to worry about what's passed to make_boot_files()
         # because we mock the method which does the real work above and here
         # we're only interested in ensuring that OmapConfig.make_boot_files()
         # does not call set_appropriate_serial_tty().
-        config.make_boot_files(
+        board_conf.make_boot_files(
             None, None, None, None, None, None, None, None)
         self.assertFalse(
             self.set_appropriate_serial_tty_called,
@@ -1659,189 +1673,219 @@
         boot_dir = os.path.join(tempdir, 'boot')
         os.makedirs(boot_dir)
         open(os.path.join(boot_dir, 'vmlinuz-2.6.35-23-foo'), 'w').close()
-        boards.BeagleConfig.set_appropriate_serial_tty(tempdir)
-        self.assertEquals('ttyS2', boards.BeagleConfig.serial_tty)
+        board_conf = boards.BeagleConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.set_appropriate_serial_tty(tempdir)
+        self.assertEquals('ttyS2', board_conf.serial_tty)
 
     def test_set_appropriate_serial_tty_new_kernel(self):
         tempdir = self.useFixture(CreateTempDirFixture()).tempdir
         boot_dir = os.path.join(tempdir, 'boot')
         os.makedirs(boot_dir)
         open(os.path.join(boot_dir, 'vmlinuz-2.6.36-13-foo'), 'w').close()
-        boards.BeagleConfig.set_appropriate_serial_tty(tempdir)
-        self.assertEquals('ttyO2', boards.BeagleConfig.serial_tty)
+        board_conf = boards.BeagleConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.set_appropriate_serial_tty(tempdir)
+        self.assertEquals('ttyO2', board_conf.serial_tty)
 
     def test_set_appropriate_serial_tty_three_dot_oh_kernel(self):
         tempdir = self.useFixture(CreateTempDirFixture()).tempdir
         boot_dir = os.path.join(tempdir, 'boot')
         os.makedirs(boot_dir)
         open(os.path.join(boot_dir, 'vmlinuz-3.0-13-foo'), 'w').close()
-        boards.BeagleConfig.set_appropriate_serial_tty(tempdir)
-        self.assertEquals('ttyO2', boards.BeagleConfig.serial_tty)
+        board_conf = boards.BeagleConfig()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        board_conf.set_appropriate_serial_tty(tempdir)
+        self.assertEquals('ttyO2', board_conf.serial_tty)
 
 
 class TestGetSfdiskCmd(TestCase):
 
+    def set_up_config(self, config):
+        config.hwpack_format = HardwarepackHandler.FORMAT_1
+
     def test_default(self):
+        board_conf = BoardConfig()
+        self.set_up_config(board_conf)
         self.assertEqual(
-            '63,106432,0x0C,*\n106496,,,-',
-            boards.BoardConfig.get_sfdisk_cmd())
+            '63,106432,0x0C,*\n106496,,,-', board_conf.get_sfdisk_cmd())
 
     def test_default_aligned(self):
+        board_conf = BoardConfig()
+        self.set_up_config(board_conf)
         self.assertEqual(
             '8192,106496,0x0C,*\n114688,,,-',
-            boards.BoardConfig.get_sfdisk_cmd(should_align_boot_part=True))
+            board_conf.get_sfdisk_cmd(should_align_boot_part=True))
 
     def test_mx5(self):
+        board_conf = boards.Mx5Config()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
         self.assertEqual(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            boards.Mx5Config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_snowball_sd(self):
+        board_conf = boards.SnowballSdConfig()
+        self.set_up_config(board_conf)
         self.assertEqual(
-            '63,106432,0x0C,*\n106496,,,-',
-            boards.SnowballSdConfig.get_sfdisk_cmd())
+            '63,106432,0x0C,*\n106496,,,-', board_conf.get_sfdisk_cmd())
 
     def test_snowball_emmc(self):
+        board_conf = boards.SnowballEmmcConfig()
+        self.set_up_config(board_conf)
         self.assertEqual(
             '256,7936,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            boards.SnowballEmmcConfig.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_smdkv310(self):
+        board_conf = get_board_config('smdkv310')
+        self.set_up_config(board_conf)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            board_configs['smdkv310'].get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_origen(self):
+        board_conf = get_board_config('origen')
+        self.set_up_config(board_conf)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            board_configs['origen'].get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_origen_quad(self):
+        board_conf = get_board_config('origen_quad')
+        self.set_up_config(board_conf)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            board_configs['origen_quad'].get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_arndale(self):
+        board_conf = get_board_config('arndale')
+        self.set_up_config(board_conf)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            board_configs['arndale'].get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_panda_android(self):
         self.assertEqual(
             '63,270272,0x0C,*\n270336,1048576,L\n1318912,524288,L\n'
             '1843200,-,E\n1843200,1048576,L\n2891776,,,-',
-            android_boards.AndroidPandaConfig.get_sfdisk_cmd())
+            android_boards.AndroidPandaConfig().get_sfdisk_cmd())
 
     def test_origen_android(self):
         self.assertEqual(
             '1,8191,0xDA\n8253,270274,0x0C,*\n278528,1048576,L\n'
             '1327104,-,E\n1327104,524288,L\n1851392,1048576,L\n2899968,,,-',
-            android_boards.AndroidOrigenConfig.get_sfdisk_cmd())
+            android_boards.AndroidOrigenConfig().get_sfdisk_cmd())
 
     def test_origen_quad_android(self):
         self.assertEqual(
             '1,8191,0xDA\n8253,270274,0x0C,*\n278528,1048576,L\n'
             '1327104,-,E\n1327104,524288,L\n1851392,1048576,L\n2899968,,,-',
-            android_boards.AndroidOrigenQuadConfig.get_sfdisk_cmd())
+            android_boards.AndroidOrigenQuadConfig().get_sfdisk_cmd())
 
     def test_snowball_emmc_android(self):
         self.assertEqual(
             '256,7936,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
             '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
-            android_boards.AndroidSnowballEmmcConfig.get_sfdisk_cmd())
+            android_boards.AndroidSnowballEmmcConfig().get_sfdisk_cmd())
 
     def test_vexpress_android(self):
         self.assertEqual(
             '63,270272,0x0E,*\n270336,1048576,L\n1318912,524288,L\n'
             '1843200,-,E\n1843200,1048576,L\n2891776,,,-',
-            android_boards.AndroidVexpressConfig.get_sfdisk_cmd())
+            android_boards.AndroidVexpressConfig().get_sfdisk_cmd())
 
     def test_mx5_android(self):
         self.assertEqual(
             '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
             '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
-            android_boards.AndroidMx53LoCoConfig.get_sfdisk_cmd())
+            android_boards.AndroidMx53LoCoConfig().get_sfdisk_cmd())
 
     def test_mx6_android(self):
         self.assertEqual(
             '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
             '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
-            android_boards.AndroidMx6QSabreliteConfig.get_sfdisk_cmd())
+            android_boards.AndroidMx6QSabreliteConfig().get_sfdisk_cmd())
 
 
 class TestGetSfdiskCmdV2(TestCase):
 
     def test_mx5(self):
-        class config(boards.Mx5Config):
-            partition_layout = 'reserved_bootfs_rootfs'
+        board_conf = boards.Mx5Config()
+        board_conf.partition_layout = 'reserved_bootfs_rootfs'
         self.assertEqual(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_snowball_sd(self):
-        class config(boards.SnowballSdConfig):
-            partition_layout = 'bootfs_rootfs'
+        board_conf = boards.SnowballSdConfig()
+        board_conf.partition_layout = 'bootfs_rootfs'
         self.assertEqual(
             '63,106432,0x0C,*\n106496,,,-',
-            config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_snowball_emmc(self):
-        class config(boards.SnowballEmmcConfig):
-            partition_layout = 'reserved_bootfs_rootfs'
-            LOADER_START_S = (128 * 1024) / SECTOR_SIZE
+        board_conf = boards.SnowballEmmcConfig()
+        board_conf.partition_layout = 'reserved_bootfs_rootfs'
+        board_conf.loader_start_s = (128 * 1024) / SECTOR_SIZE
         self.assertEqual(
             '256,7936,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_smdkv310(self):
-        class config(board_configs['smdkv310']):
-            partition_layout = 'reserved_bootfs_rootfs'
-            LOADER_MIN_SIZE_S = (boards.BoardConfig.samsung_bl1_start +
-                                 boards.BoardConfig.samsung_bl1_len +
-                                 boards.BoardConfig.samsung_bl2_len +
-                                 boards.BoardConfig.samsung_env_len)
+        board_conf = get_board_config('smdkv310')
+        board_conf.partition_layout = 'reserved_bootfs_rootfs'
+        board_conf.LOADER_MIN_SIZE_S = (
+            board_conf.samsung_bl1_start +
+            board_conf.samsung_bl1_len +
+            board_conf.samsung_bl2_len +
+            board_conf.samsung_env_len)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_origen(self):
-        class config(board_configs['origen']):
-            partition_layout = 'reserved_bootfs_rootfs'
-            LOADER_MIN_SIZE_S = (boards.BoardConfig.samsung_bl1_start +
-                                 boards.BoardConfig.samsung_bl1_len +
-                                 boards.BoardConfig.samsung_bl2_len +
-                                 boards.BoardConfig.samsung_env_len)
+        board_conf = get_board_config('origen')
+        board_conf.partition_layout = 'reserved_bootfs_rootfs'
+        board_conf.LOADER_MIN_SIZE_S = (
+                                 board_conf.samsung_bl1_start +
+                                 board_conf.samsung_bl1_len +
+                                 board_conf.samsung_bl2_len +
+                                 board_conf.samsung_env_len)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_origen_quad(self):
-        class config(board_configs['origen_quad']):
-            partition_layout = 'reserved_bootfs_rootfs'
-            LOADER_MIN_SIZE_S = (boards.BoardConfig.samsung_bl1_start +
-                                 boards.BoardConfig.samsung_bl1_len +
-                                 boards.BoardConfig.samsung_bl2_len +
-                                 boards.BoardConfig.samsung_env_len)
+        board_conf = get_board_config('origen_quad')
+        board_conf.partition_layout = 'reserved_bootfs_rootfs'
+        board_conf.LOADER_MIN_SIZE_S = (
+                                board_conf.samsung_bl1_start +
+                                board_conf.samsung_bl1_len +
+                                board_conf.samsung_bl2_len +
+                                board_conf.samsung_env_len)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
     def test_arndale(self):
-        class config(board_configs['arndale']):
-            partition_layout = 'reserved_bootfs_rootfs'
-            LOADER_MIN_SIZE_S = (boards.BoardConfig.samsung_bl1_start +
-                                 boards.BoardConfig.samsung_bl1_len +
-                                 boards.BoardConfig.samsung_bl2_len +
-                                 boards.BoardConfig.samsung_env_len)
+        board_conf = get_board_config('arndale')
+        board_conf.partition_layout = 'reserved_bootfs_rootfs'
+        board_conf.LOADER_MIN_SIZE_S = (
+            board_conf.samsung_bl1_start +
+            board_conf.samsung_bl1_len +
+            board_conf.samsung_bl2_len +
+            board_conf.samsung_env_len)
         self.assertEquals(
             '1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-',
-            config.get_sfdisk_cmd())
+            board_conf.get_sfdisk_cmd())
 
 
 class TestGetBootCmd(TestCase):
 
     def test_vexpress(self):
-        boot_commands = board_configs['vexpress']._get_boot_env(
+        board_conf = get_board_config('vexpress')
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=['ttyXXX'],
             rootfs_id="UUID=deadbeef", i_img_data="initrd", d_img_data=None)
         expected = {
@@ -1855,7 +1899,8 @@
         self.assertEqual(expected, boot_commands)
 
     def test_vexpress_a9(self):
-        boot_commands = board_configs['vexpress-a9']._get_boot_env(
+        board_conf = get_board_config('vexpress-a9')
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=['ttyXXX'],
             rootfs_id="UUID=deadbeef", i_img_data="initrd", d_img_data=None)
         expected = {
@@ -1869,7 +1914,8 @@
         self.assertEqual(expected, boot_commands)
 
     def test_mx51(self):
-        boot_commands = boards.Mx51Config._get_boot_env(
+        board_conf = boards.Mx51Config()
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_id="UUID=deadbeef", i_img_data="initrd",
             d_img_data="mx51.dtb")
@@ -1885,7 +1931,8 @@
         self.assertEqual(expected, boot_commands)
 
     def test_smdkv310(self):
-        boot_commands = board_configs['smdkv310']._get_boot_env(
+        board_conf = get_board_config('smdkv310')
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_id="UUID=deadbeef", i_img_data="initrd", d_img_data=None)
         expected = {
@@ -1901,7 +1948,8 @@
         self.assertEqual(expected, boot_commands)
 
     def test_origen(self):
-        boot_commands = board_configs['origen']._get_boot_env(
+        board_conf = get_board_config('origen')
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_id="UUID=deadbeef", i_img_data="initrd", d_img_data=None)
         expected = {
@@ -1915,7 +1963,8 @@
         self.assertEqual(expected, boot_commands)
 
     def test_origen_quad(self):
-        boot_commands = board_configs['origen_quad']._get_boot_env(
+        board_conf = get_board_config('origen_quad')
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_id="UUID=deadbeef", i_img_data="initrd", d_img_data=None)
         expected = {
@@ -1929,7 +1978,8 @@
         self.assertEqual(expected, boot_commands)
 
     def test_ux500(self):
-        boot_commands = board_configs['ux500']._get_boot_env(
+        board_conf = get_board_config('ux500')
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_id="UUID=deadbeef", i_img_data="initrd", d_img_data=None)
         expected = {
@@ -1947,7 +1997,8 @@
         self.assertEqual(expected, boot_commands)
 
     def test_snowball_emmc(self):
-        boot_commands = board_configs['snowball_emmc']._get_boot_env(
+        board_conf = get_board_config('snowball_emmc')
+        boot_commands = board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_id="UUID=deadbeef", i_img_data="initrd", d_img_data=None)
         expected = {
@@ -1968,7 +2019,7 @@
         # XXX: To fix bug 697824 we have to change class attributes of our
         # OMAP board configs, and some tests do that so to make sure they
         # don't interfere with us we'll reset that before doing anything.
-        config = board_configs['panda']
+        config = get_board_config('panda')
         config.serial_tty = config._serial_tty
         boot_commands = config._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
@@ -1991,7 +2042,7 @@
         # XXX: To fix bug 697824 we have to change class attributes of our
         # OMAP board configs, and some tests do that so to make sure they
         # don't interfere with us we'll reset that before doing anything.
-        config = board_configs['beagle']
+        config = get_board_config('beagle')
         config.serial_tty = config._serial_tty
         boot_commands = config._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
@@ -2014,7 +2065,7 @@
         # XXX: To fix bug 697824 we have to change class attributes of our
         # OMAP board configs, and some tests do that so to make sure they
         # don't interfere with us we'll reset that before doing anything.
-        config = boards.IgepConfig
+        config = boards.IgepConfig()
         config.serial_tty = config._serial_tty
         boot_cmd = config._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
@@ -2037,7 +2088,7 @@
         # XXX: To fix bug 697824 we have to change class attributes of our
         # OMAP board configs, and some tests do that so to make sure they
         # don't interfere with us we'll reset that before doing anything.
-        config = board_configs['overo']
+        config = get_board_config('overo')
         config.serial_tty = config._serial_tty
         boot_commands = config._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
@@ -2060,12 +2111,15 @@
 
 class TestExtraBootCmd(TestCaseWithFixtures):
 
+    def setUp(self):
+        super(TestExtraBootCmd, self).setUp()
+        self.board_conf = BoardConfig()
+
     def test_extra_boot_args_options_is_picked_by_get_boot_env(self):
         boot_args = 'whatever'
 
-        class config(BoardConfig):
-            extra_boot_args_options = boot_args
-        boot_commands = config._get_boot_env(
+        self.board_conf.extra_boot_args_options = boot_args
+        boot_commands = self.board_conf._get_boot_env(
             is_live=False, is_lowmem=False, consoles=['ttyXXX'],
             rootfs_id="UUID=deadbeef", i_img_data=None, d_img_data=None)
         expected = (
@@ -2075,28 +2129,25 @@
     def test_passing_None_to_add_boot_args(self):
         boot_args = 'extra-args'
 
-        class config(BoardConfig):
-            extra_boot_args_options = boot_args
-        config.add_boot_args(None)
-        self.assertEqual(boot_args, config.extra_boot_args_options)
+        self.board_conf.extra_boot_args_options = boot_args
+        self.board_conf.add_boot_args(None)
+        self.assertEqual(boot_args, self.board_conf.extra_boot_args_options)
 
     def test_passing_string_to_add_boot_args(self):
         boot_args = 'extra-args'
         extra_args = 'user-args'
 
-        class config(BoardConfig):
-            extra_boot_args_options = boot_args
-        config.add_boot_args(extra_args)
+        self.board_conf.extra_boot_args_options = boot_args
+        self.board_conf.add_boot_args(extra_args)
         self.assertEqual(
-            "%s %s" % (boot_args, extra_args), config.extra_boot_args_options)
+            "%s %s" % (boot_args, extra_args),
+            self.board_conf.extra_boot_args_options)
 
     def test_passing_string_to_add_boot_args_with_no_default_extra_args(self):
         extra_args = 'user-args'
 
-        class config(BoardConfig):
-            extra_boot_args_options = None
-        config.add_boot_args(extra_args)
-        self.assertEqual(extra_args, config.extra_boot_args_options)
+        self.board_conf.add_boot_args(extra_args)
+        self.assertEqual(extra_args, self.board_conf.extra_boot_args_options)
 
     def test_add_boot_args_from_file(self):
         boot_args = 'extra-args'
@@ -2105,19 +2156,18 @@
         with open(boot_arg_path, 'w') as boot_arg_file:
             boot_arg_file.write(extra_args)
 
-        class config(BoardConfig):
-            extra_boot_args_options = boot_args
-        config.add_boot_args_from_file(boot_arg_path)
+        self.board_conf.extra_boot_args_options = boot_args
+        self.board_conf.add_boot_args_from_file(boot_arg_path)
         self.assertEqual(
-            "%s %s" % (boot_args, extra_args), config.extra_boot_args_options)
+            "%s %s" % (boot_args, extra_args),
+            self.board_conf.extra_boot_args_options)
 
     def test_passing_None_to_add_boot_args_from_file(self):
         boot_args = 'extra-args'
 
-        class config(BoardConfig):
-            extra_boot_args_options = boot_args
-        config.add_boot_args_from_file(None)
-        self.assertEqual(boot_args, config.extra_boot_args_options)
+        self.board_conf.extra_boot_args_options = boot_args
+        self.board_conf.add_boot_args_from_file(None)
+        self.assertEqual(boot_args, self.board_conf.extra_boot_args_options)
 
     def test_add_boot_args_from_file_strips_whitespace_from_file(self):
         boot_args = 'extra-args'
@@ -2126,134 +2176,11 @@
         with open(boot_arg_path, 'w') as boot_arg_file:
             boot_arg_file.write('\n\n \t ' + extra_args + '  \n\n')
 
-        class config(BoardConfig):
-            extra_boot_args_options = boot_args
-        config.add_boot_args_from_file(boot_arg_path)
+        self.board_conf.extra_boot_args_options = boot_args
+        self.board_conf.add_boot_args_from_file(boot_arg_path)
         self.assertEqual(
-            "%s %s" % (boot_args, extra_args), config.extra_boot_args_options)
-
-
-class TestGetBootCmdAndroid(TestCase):
-
-    def test_panda(self):
-        # XXX: To fix bug 697824 we have to change class attributes of our
-        # OMAP board configs, and some tests do that so to make sure they
-        # don't interfere with us we'll reset that before doing anything.
-        config = android_board_configs['panda']
-        config.serial_tty = config._serial_tty
-        expected = {
-            'bootargs': 'console=ttyO2,115200n8 '
-                        'rootwait ro earlyprintk fixrtc '
-                        'nocompcache vram=48M omapfb.vram=0:24M,1:24M '
-                        'mem=456M@0x80000000 mem=512M@0xA0000000 '
-                        'init=/init androidboot.console=ttyO2',
-            'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
-                       'fatload mmc 0:1 0x81600000 uInitrd; '
-                       'fatload mmc 0:1 0x815f0000 board.dtb; '
-                       'bootm 0x80200000 0x81600000 0x815f0000',
-            'fdt_high': '0xffffffff',
-            'initrd_high': '0xffffffff'}
-        self.assertBootEnv(config, expected)
-
-    def test_android_snowball_sd(self):
-        expected = {
-            'bootargs': 'console=ttyAMA2,115200n8 '
-                        'rootwait ro earlyprintk '
-                        'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
-                        'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
-                        'vmalloc=500M init=/init androidboot.console=ttyAMA2',
-            'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; '
-                       'fatload mmc 1:1 0x05000000 uInitrd; '
-                       'fatload mmc 1:1 0x8000000 board.dtb; '
-                       'bootm 0x00100000 0x05000000 0x8000000',
-            'fdt_high': '0x05000000',
-            'initrd_high': '0x06000000'}
-        self.assertBootEnv(
-            android_boards.AndroidSnowballSdConfig, expected)
-
-    def test_android_snowball_emmc(self):
-        expected = {
-            'bootargs': 'console=ttyAMA2,115200n8 '
-                        'rootwait ro earlyprintk '
-                        'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
-                        'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
-                        'vmalloc=500M init=/init androidboot.console=ttyAMA2',
-            'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; '
-                       'fatload mmc 0:2 0x05000000 uInitrd; '
-                       'fatload mmc 0:2 0x8000000 board.dtb; '
-                       'bootm 0x00100000 0x05000000 0x8000000',
-            'fdt_high': '0x05000000',
-            'initrd_high': '0x06000000'}
-        self.assertBootEnv(
-            android_boards.AndroidSnowballEmmcConfig, expected)
-
-    def test_android_origen(self):
-        expected = {
-            'bootargs': 'console=tty0 console=ttySAC2,115200n8 '
-                        'rootwait ro init=/init androidboot.console=ttySAC2',
-            'bootcmd': 'fatload mmc 0:2 0x40007000 uImage; '
-                       'fatload mmc 0:2 0x42000000 uInitrd; '
-                       'bootm 0x40007000 0x42000000',
-            'fdt_high': '0xffffffff',
-            'initrd_high': '0xffffffff'}
-        self.assertBootEnv(
-            android_boards.AndroidOrigenConfig, expected)
-
-    def test_android_origen_quad(self):
-        expected = {
-            'bootargs': 'console=tty0 console=ttySAC2,115200n8 '
-                        'rootwait ro init=/init androidboot.console=ttySAC2',
-            'bootcmd': 'fatload mmc 0:2 0x40007000 uImage; '
-                       'fatload mmc 0:2 0x42000000 uInitrd; '
-                       'bootm 0x40007000 0x42000000',
-            'fdt_high': '0xffffffff',
-            'initrd_high': '0xffffffff'}
-        self.assertBootEnv(
-            android_boards.AndroidOrigenQuadConfig, expected)
-
-    def test_android_vexpress(self):
-        expected = {
-            'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
-                        'rootwait ro init=/init androidboot.console=ttyAMA0',
-            'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; '
-                       'fatload mmc 0:1 0x62000000 uInitrd; '
-                       'bootm 0x60000000 0x62000000',
-            'fdt_high': '0xffffffff',
-            'initrd_high': '0xffffffff'}
-        self.assertBootEnv(
-            android_boards.AndroidVexpressConfig, expected)
-
-    def test_android_mx5(self):
-        expected = {
-            'bootargs': 'console=ttymxc0,115200n8 '
-                        'rootwait ro earlyprintk rootdelay=1 fixrtc '
-                        'nocompcache di1_primary tve init=/init '
-                        'androidboot.console=ttymxc0',
-            'bootcmd': 'fatload mmc 0:2 0x70000000 uImage; '
-                       'fatload mmc 0:2 0x72000000 uInitrd; '
-                       'bootm 0x70000000 0x72000000',
-            'fdt_high': '0xffffffff',
-            'initrd_high': '0xffffffff'}
-        self.assertBootEnv(
-            android_boards.AndroidMx53LoCoConfig, expected)
-
-    def test_android_mx6(self):
-        expected = {
-            'bootargs': 'console=ttymxc0,115200n8 '
-                        'rootwait ro earlyprintk rootdelay=1 fixrtc '
-                        'nocompcache di1_primary tve init=/init '
-                        'androidboot.console=ttymxc0',
-            'bootcmd': 'fatload mmc 0:2 0x10000000 uImage; '
-                       'fatload mmc 0:2 0x12000000 uInitrd; '
-                       'fatload mmc 0:2 0x11ff0000 board.dtb; '
-                       'bootm 0x10000000 0x12000000 0x11ff0000',
-            'fdt_high': '0xffffffff',
-            'initrd_high': '0xffffffff'}
-        self.assertBootEnv(
-            android_boards.AndroidMx6QSabreliteConfig, expected)
-
-    def assertBootEnv(self, config, expected):
-        self.assertEqual(expected, config._get_boot_env(consoles=[]))
+            "%s %s" % (boot_args, extra_args),
+            self.board_conf.extra_boot_args_options)
 
 
 class TestUnpackBinaryTarball(TestCaseWithFixtures):
@@ -2375,119 +2302,110 @@
             boards, '_get_mlo_file',
             lambda chroot_dir: "%s/MLO" % chroot_dir))
 
-        class config(BoardConfig):
-            pass
-        config.set_metadata([])
-        install_omap_boot_loader("chroot_dir", "boot_disk", config)
+        board_conf = BoardConfig()
+        board_conf.set_metadata([])
+        install_omap_boot_loader("chroot_dir", "boot_disk", board_conf)
         expected = [
             '%s cp -v chroot_dir/MLO boot_disk' % sudo_args, 'sync']
         self.assertEqual(expected, fixture.mock.commands_executed)
 
     def test_install_smdk_u_boot(self):
         fixture = self._mock_Popen()
-        bootloader_flavor = boards.SMDKV310Config.bootloader_flavor
+        board_conf = boards.SMDKV310Config()
+        bootloader_flavor = board_conf.bootloader_flavor
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
-        boards.SMDKV310Config.install_samsung_boot_loader(
+        board_conf.install_samsung_boot_loader(
             "%s/%s/SPL" % ("chroot_dir", bootloader_flavor),
             "%s/%s/uboot" % ("chroot_dir", bootloader_flavor), "boot_disk")
         expected = [
             '%s dd if=chroot_dir/%s/SPL of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.SMDKV310Config.samsung_bl1_start),
+                         board_conf.samsung_bl1_start),
             '%s dd if=chroot_dir/%s/uboot of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.SMDKV310Config.samsung_bl2_start)]
+                         board_conf.samsung_bl2_start)]
         self.assertEqual(expected, fixture.mock.commands_executed)
 
+    def _set_up_board_config(self, board_name):
+        """Internal method to set-up correctly board config, with the
+        appropriate mock objects.
+
+        :param board_name: The name of the board to set-up.
+        :return A 3-tuple: the config, the name of the bootloader, and the
+        value of chroot_dir.
+        """
+        board_conf = get_board_config(board_name)
+        bootloader_flavor = board_conf.bootloader_flavor
+        # Made-up value to be used as the chroot directory.
+        chroot_dir_value = 'chroot_dir'
+        board_conf._get_samsung_spl = MagicMock()
+        board_conf._get_samsung_spl.return_value = ("%s/%s/SPL" %
+            (chroot_dir_value, bootloader_flavor))
+        board_conf._get_samsung_bootloader = MagicMock()
+        board_conf._get_samsung_bootloader.return_value = ("%s/%s/uboot" %
+            (chroot_dir_value, bootloader_flavor))
+        board_conf.hardwarepack_handler = (
+            TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
+        board_conf.hardwarepack_handler.get_format = (
+            lambda: HardwarepackHandler.FORMAT_1)
+        return board_conf, bootloader_flavor, chroot_dir_value
+
     def test_install_origen_u_boot(self):
         fixture = self._mock_Popen()
-        bootloader_flavor = boards.OrigenConfig.bootloader_flavor
-        self.useFixture(MockSomethingFixture(
-            boards.OrigenConfig, '_get_samsung_spl',
-            classmethod(lambda cls, chroot_dir: "%s/%s/SPL" % (
-                chroot_dir, bootloader_flavor))))
-        self.useFixture(MockSomethingFixture(
-            boards.OrigenConfig, '_get_samsung_bootloader',
-            classmethod(lambda cls, chroot_dir: "%s/%s/uboot" % (
-                chroot_dir, bootloader_flavor))))
-        boards.OrigenConfig.hardwarepack_handler = (
-            TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        boards.OrigenConfig.hardwarepack_handler.get_format = (
-            lambda: '1.0')
+        board_conf, bootloader_flavor, chroot_dir_value = \
+            self._set_up_board_config('origen')
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
-        boards.OrigenConfig.install_samsung_boot_loader(
-            boards.OrigenConfig._get_samsung_spl("chroot_dir"),
-            boards.OrigenConfig._get_samsung_bootloader("chroot_dir"),
+        board_conf.install_samsung_boot_loader(
+            board_conf._get_samsung_spl(chroot_dir_value),
+            board_conf._get_samsung_bootloader(chroot_dir_value),
             "boot_disk")
         expected = [
             '%s dd if=chroot_dir/%s/SPL of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.OrigenConfig.samsung_bl1_start),
+                         board_conf.samsung_bl1_start),
             '%s dd if=chroot_dir/%s/uboot of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.OrigenConfig.samsung_bl2_start)]
+                         board_conf.samsung_bl2_start)]
         self.assertEqual(expected, fixture.mock.commands_executed)
 
     def test_install_origen_quad_u_boot(self):
         fixture = self._mock_Popen()
-        bootloader_flavor = boards.OrigenQuadConfig.bootloader_flavor
-        self.useFixture(MockSomethingFixture(
-            boards.OrigenQuadConfig, '_get_samsung_spl',
-            classmethod(lambda cls, chroot_dir: "%s/%s/SPL" % (
-                chroot_dir, bootloader_flavor))))
-        self.useFixture(MockSomethingFixture(
-            boards.OrigenQuadConfig, '_get_samsung_bootloader',
-            classmethod(lambda cls, chroot_dir: "%s/%s/uboot" % (
-                chroot_dir, bootloader_flavor))))
-        boards.OrigenQuadConfig.hardwarepack_handler = (
-            TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        boards.OrigenQuadConfig.hardwarepack_handler.get_format = (
-            lambda: '1.0')
+        board_conf, bootloader_flavor, chroot_dir_value = \
+            self._set_up_board_config('origen_quad')
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
                                              lambda file: 1))
-        boards.OrigenQuadConfig.install_samsung_boot_loader(
-            boards.OrigenQuadConfig._get_samsung_spl("chroot_dir"),
-            boards.OrigenQuadConfig._get_samsung_bootloader("chroot_dir"),
+        board_conf.install_samsung_boot_loader(
+            board_conf._get_samsung_spl(chroot_dir_value),
+            board_conf._get_samsung_bootloader(chroot_dir_value),
             "boot_disk")
         expected = [
             '%s dd if=chroot_dir/%s/SPL of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.OrigenQuadConfig.samsung_bl1_start),
+                         board_conf.samsung_bl1_start),
             '%s dd if=chroot_dir/%s/uboot of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.OrigenQuadConfig.samsung_bl2_start)]
+                         board_conf.samsung_bl2_start)]
         self.assertEqual(expected, fixture.mock.commands_executed)
 
     def test_install_arndale_u_boot(self):
         fixture = self._mock_Popen()
-        bootloader_flavor = boards.ArndaleConfig.bootloader_flavor
-        self.useFixture(MockSomethingFixture(
-            boards.ArndaleConfig, '_get_samsung_spl',
-            classmethod(lambda cls, chroot_dir: "%s/%s/SPL" % (
-                chroot_dir, bootloader_flavor))))
-        self.useFixture(MockSomethingFixture(
-            boards.ArndaleConfig, '_get_samsung_bootloader',
-            classmethod(lambda cls, chroot_dir: "%s/%s/uboot" % (
-                chroot_dir, bootloader_flavor))))
-        boards.ArndaleConfig.hardwarepack_handler = (
-            TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz'))
-        boards.ArndaleConfig.hardwarepack_handler.get_format = (
-            lambda: '1.0')
+        board_conf, bootloader_flavor, chroot_dir_value = \
+            self._set_up_board_config('arndale')
         self.useFixture(MockSomethingFixture(os.path, 'getsize',
             lambda file: 1))
-        boards.ArndaleConfig.install_samsung_boot_loader(
-            boards.ArndaleConfig._get_samsung_spl("chroot_dir"),
-            boards.ArndaleConfig._get_samsung_bootloader("chroot_dir"),
+        board_conf.install_samsung_boot_loader(
+            board_conf._get_samsung_spl(chroot_dir_value),
+            board_conf._get_samsung_bootloader(chroot_dir_value),
             "boot_disk")
         expected = [
             '%s dd if=chroot_dir/%s/SPL of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.ArndaleConfig.samsung_bl1_start),
+                         board_conf.samsung_bl1_start),
             '%s dd if=chroot_dir/%s/uboot of=boot_disk bs=512 conv=notrunc '
             'seek=%d' % (sudo_args, bootloader_flavor,
-                         boards.ArndaleConfig.samsung_bl2_start)]
+                         board_conf.samsung_bl2_start)]
         self.assertEqual(expected, fixture.mock.commands_executed)
 
     def test_get_plain_boot_script_contents(self):
@@ -2544,77 +2462,77 @@
         flavorx = 'flavorX'
         flavorxy = 'flavorXY'
 
-        class config(boards.BoardConfig):
-            kernel_flavors = [flavorx, flavorxy]
-        for f in reversed(config.kernel_flavors):
+        board_conf = BoardConfig()
+        board_conf.kernel_flavors = [flavorx, flavorxy]
+        for f in reversed(board_conf.kernel_flavors):
             kfile = os.path.join(tempdir, 'vmlinuz-1-%s' % f)
             ifile = os.path.join(tempdir, 'initrd.img-1-%s' % f)
             open(kfile, "w").close()
             open(ifile, "w").close()
         self.assertEqual(
-            (kfile, ifile, None), config._get_kflavor_files(tempdir))
+            (kfile, ifile, None), board_conf._get_kflavor_files(tempdir))
 
     def test_get_dt_kflavor_files_more_specific(self):
         tempdir = self.useFixture(CreateTempDirFixture()).tempdir
         flavorx = 'flavorX'
         flavorxy = 'flavorXY'
 
-        class config(boards.BoardConfig):
-            kernel_flavors = [flavorx, flavorxy]
-            dtb_name = 'board_name.dtb'
-        for f in reversed(config.kernel_flavors):
+        board_conf = BoardConfig()
+        board_conf.kernel_flavors = [flavorx, flavorxy]
+        board_conf.dtb_name = 'board_name.dtb'
+        for f in reversed(board_conf.kernel_flavors):
             kfile = os.path.join(tempdir, 'vmlinuz-1-%s' % f)
             ifile = os.path.join(tempdir, 'initrd.img-1-%s' % f)
             dt = os.path.join(tempdir, 'dt-1-%s' % f)
             os.mkdir(dt)
-            dfile = os.path.join(dt, config.dtb_name)
+            dfile = os.path.join(dt, board_conf.dtb_name)
             open(kfile, "w").close()
             open(ifile, "w").close()
             open(dfile, "w").close()
         self.assertEqual(
-            (kfile, ifile, dfile), config._get_kflavor_files(tempdir))
+            (kfile, ifile, dfile), board_conf._get_kflavor_files(tempdir))
 
     def test_get_kflavor_files_later_in_flavors(self):
         tempdir = self.useFixture(CreateTempDirFixture()).tempdir
         flavor1 = 'flavorXY'
         flavor2 = 'flavorAA'
 
-        class config(boards.BoardConfig):
-            kernel_flavors = [flavor1, flavor2]
+        board_conf = BoardConfig()
+        board_conf.kernel_flavors = [flavor1, flavor2]
         kfile = os.path.join(tempdir, 'vmlinuz-1-%s' % flavor1)
         ifile = os.path.join(tempdir, 'initrd.img-1-%s' % flavor1)
         open(kfile, "w").close()
         open(ifile, "w").close()
         self.assertEqual(
-            (kfile, ifile, None), config._get_kflavor_files(tempdir))
+            (kfile, ifile, None), board_conf._get_kflavor_files(tempdir))
 
     def test_get_dt_kflavor_files_later_in_flavors(self):
         tempdir = self.useFixture(CreateTempDirFixture()).tempdir
         flavor1 = 'flavorXY'
         flavor2 = 'flavorAA'
 
-        class config(boards.BoardConfig):
-            kernel_flavors = [flavor1, flavor2]
-            dtb_name = 'board_name.dtb'
+        board_conf = BoardConfig()
+        board_conf.kernel_flavors = [flavor1, flavor2]
+        board_conf.dtb_name = 'board_name.dtb'
         kfile = os.path.join(tempdir, 'vmlinuz-1-%s' % flavor1)
         ifile = os.path.join(tempdir, 'initrd.img-1-%s' % flavor1)
         dt = os.path.join(tempdir, 'dt-1-%s' % flavor1)
         os.mkdir(dt)
-        dfile = os.path.join(dt, config.dtb_name)
+        dfile = os.path.join(dt, board_conf.dtb_name)
         open(kfile, "w").close()
         open(ifile, "w").close()
         open(dfile, "w").close()
         self.assertEqual(
-            (kfile, ifile, dfile), config._get_kflavor_files(tempdir))
+            (kfile, ifile, dfile), board_conf._get_kflavor_files(tempdir))
 
     def test_get_kflavor_files_raises_when_no_match(self):
         tempdir = self.useFixture(CreateTempDirFixture()).tempdir
         flavor1 = 'flavorXY'
         flavor2 = 'flavorAA'
 
-        class config(boards.BoardConfig):
-            kernel_flavors = [flavor1, flavor2]
-        self.assertRaises(ValueError, config._get_kflavor_files, tempdir)
+        board_conf = BoardConfig()
+        board_conf.kernel_flavors = [flavor1, flavor2]
+        self.assertRaises(ValueError, board_conf._get_kflavor_files, tempdir)
 
     def test_get_file_matching_no_files_found(self):
         self.assertEqual(
@@ -2647,8 +2565,6 @@
         # Stub time.sleep() as create_partitions() use that.
         self.orig_sleep = time.sleep
         time.sleep = lambda s: None
-        boards = linaro_image_tools.media_create.boards
-        boards.BoardConfig.hwpack_format = '1.0'
 
     def tearDown(self):
         super(TestCreatePartitions, self).tearDown()
@@ -2659,7 +2575,9 @@
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
-        create_partitions(boards.Mx5Config, self.media, HEADS, SECTORS, '')
+        board_conf = boards.Mx5Config()
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        create_partitions(board_conf, self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -2680,8 +2598,9 @@
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
-        create_partitions(
-            board_configs['smdkv310'], self.media, HEADS, SECTORS, '')
+        board_conf = get_board_config('smdkv310')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        create_partitions(board_conf, self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -2701,8 +2620,9 @@
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
-        create_partitions(
-            board_configs['origen'], self.media, HEADS, SECTORS, '')
+        board_conf = get_board_config('origen')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        create_partitions(board_conf, self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -2722,8 +2642,10 @@
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
+        board_conf = get_board_config('origen_quad')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
         create_partitions(
-            board_configs['origen_quad'], self.media, HEADS, SECTORS, '')
+            board_conf, self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -2743,8 +2665,10 @@
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
+        board_conf = get_board_config('arndale')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
         create_partitions(
-            board_configs['arndale'], self.media, HEADS, SECTORS, '')
+            board_conf, self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -2763,8 +2687,9 @@
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
-        create_partitions(
-            board_configs['beagle'], self.media, HEADS, SECTORS, '')
+        board_conf = get_board_config('beagle')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        create_partitions(board_conf, self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -2782,8 +2707,9 @@
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
         tmpfile = self.createTempFileAsFixture()
-        create_partitions(
-            board_configs['beagle'], Media(tmpfile), HEADS, SECTORS, '')
+        board_conf = get_board_config('beagle')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+        create_partitions(board_conf, Media(tmpfile), HEADS, SECTORS, '')
 
         # Unlike the test for partitioning of a regular block device, in this
         # case parted was not called as there's no existing partition table
@@ -3017,7 +2943,7 @@
         self.assertEqual(
             ("%s%d" % (tmpfile, 1), "%s%d" % (tmpfile, 2)),
             get_boot_and_root_partitions_for_media(
-                media, board_configs['beagle']))
+                media, get_board_config('beagle')))
 
     def test_get_boot_and_root_partitions_for_media_mx5(self):
         self.useFixture(MockSomethingFixture(
@@ -3028,7 +2954,7 @@
         media.is_block_device = True
         self.assertEqual(
             ("%s%d" % (tmpfile, 2), "%s%d" % (tmpfile, 3)),
-            get_boot_and_root_partitions_for_media(media, boards.Mx5Config))
+            get_boot_and_root_partitions_for_media(media, boards.Mx5Config()))
 
     def _create_qemu_img_with_partitions(self, sfdisk_commands, tempfile_size):
         tmpfile = self.createTempFileAsFixture()
@@ -3142,8 +3068,12 @@
         self.useFixture(MockSomethingFixture(
             partitions, 'get_boot_and_root_loopback_devices',
             lambda image: ('/dev/loop99', '/dev/loop98')))
+
+        board_conf = get_board_config('beagle')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+
         bootfs_dev, rootfs_dev = setup_partitions(
-            board_configs['beagle'], Media(tmpfile), '2G', 'boot',
+            board_conf, Media(tmpfile), '2G', 'boot',
             'root', 'ext3', True, True, True)
         self.assertEqual(
              # This is the call that would create a 2 GiB image file.
@@ -3173,8 +3103,12 @@
         # Pretend our tmpfile is a block device.
         media.is_block_device = True
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
+
+        board_conf = get_board_config('beagle')
+        board_conf.hwpack_format = HardwarepackHandler.FORMAT_1
+
         bootfs_dev, rootfs_dev = setup_partitions(
-            board_configs['beagle'], media, '2G', 'boot', 'root', 'ext3',
+            board_conf, media, '2G', 'boot', 'root', 'ext3',
             True, True, True)
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, tmpfile),
@@ -3200,7 +3134,7 @@
             mock_get_udisks_device_path))
 
         tmpfile = self.createTempFileAsFixture()
-        partition = board_configs['beagle'].mmc_part_offset
+        partition = get_board_config('beagle').mmc_part_offset
 
         self.useFixture(MockSomethingFixture(
             glob, 'glob',
@@ -3243,7 +3177,7 @@
             mock_get_udisks_device_file))
 
         tmpfile = self.createTempFileAsFixture()
-        partition = board_configs['beagle'].mmc_part_offset
+        partition = get_board_config('beagle').mmc_part_offset
 
         self.useFixture(MockSomethingFixture(
             glob, 'glob',
@@ -3328,14 +3262,12 @@
         self.saved_args = args
 
     def prepare_config(self, config):
-        class c(config):
-            pass
-
-        self.config = c
+        self.config = config
         self.config.boot_script = 'boot_script'
         self.config.hardwarepack_handler = \
             TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz')
-        self.config.hardwarepack_handler.get_format = lambda: '1.0'
+        self.config.hardwarepack_handler.get_format = \
+            lambda: HardwarepackHandler.FORMAT_1
         self.popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         self.useFixture(MockSomethingFixture(
             self.config, 'make_boot_files', self.save_args))
@@ -3351,10 +3283,7 @@
         return None
 
     def prepare_config_v3(self, config):
-        class c(config):
-            pass
-
-        self.config = c
+        self.config = config
         self.config.boot_script = 'boot_script'
         self.config.hardwarepack_handler = \
             TestSetMetadata.MockHardwarepackHandler('ahwpack.tar.gz')
@@ -3378,21 +3307,21 @@
             'boot_device_or_file', is_live, False, [])
 
     def test_populate_boot_live(self):
-        self.prepare_config(boards.BoardConfig)
+        self.prepare_config(BoardConfig())
         self.call_populate_boot(self.config, is_live=True)
         self.assertEquals(
             self.expected_calls, self.popen_fixture.mock.commands_executed)
         self.assertEquals(self.expected_args_live, self.saved_args)
 
     def test_populate_boot_regular(self):
-        self.prepare_config(boards.BoardConfig)
+        self.prepare_config(BoardConfig())
         self.call_populate_boot(self.config)
         self.assertEquals(
             self.expected_calls, self.popen_fixture.mock.commands_executed)
         self.assertEquals(self.expected_args, self.saved_args)
 
     def test_populate_boot_bootloader_flavor(self):
-        self.prepare_config(boards.BoardConfig)
+        self.prepare_config(BoardConfig())
         self.config.bootloader_flavor = "bootloader_flavor"
         self.call_populate_boot(self.config)
         self.assertEquals(
@@ -3400,7 +3329,7 @@
         self.assertEquals(self.expected_args, self.saved_args)
 
     def test_populate_boot_bootloader_file_in_boot_part(self):
-        self.prepare_config(boards.BoardConfig)
+        self.prepare_config(BoardConfig())
         self.config.bootloader_flavor = "bootloader_flavor"
         self.config.bootloader_file_in_boot_part = True
         self.config.bootloader = "u_boot"
@@ -3414,7 +3343,7 @@
         self.assertEquals(self.expected_args, self.saved_args)
 
     def test_populate_boot_bootloader_file_in_boot_part_false(self):
-        self.prepare_config(boards.BoardConfig)
+        self.prepare_config(BoardConfig())
         self.config.bootloader_flavor = "bootloader_flavor"
         self.config.bootloader_file_in_boot_part = False
         self.call_populate_boot(self.config)
@@ -3424,7 +3353,7 @@
         self.assertEquals(self.expected_args, self.saved_args)
 
     def test_populate_bootloader_copy_files(self):
-        self.prepare_config_v3(boards.BoardConfig)
+        self.prepare_config_v3(BoardConfig())
         self.config.bootloader_flavor = "bootloader_flavor"
         # Test that copy_files works per spec (puts stuff in boot partition)
         # even if bootloader not in_boot_part.
@@ -3444,7 +3373,7 @@
         self.assertEquals(self.expected_args, self.saved_args)
 
     def test_populate_bootloader_copy_files_bootloader_set(self):
-        self.prepare_config_v3(boards.BoardConfig)
+        self.prepare_config_v3(BoardConfig())
         self.config.bootloader_flavor = "bootloader_flavor"
         # Test that copy_files works per spec (puts stuff in boot partition)
         # even if bootloader not in_boot_part.
@@ -3465,7 +3394,7 @@
         self.assertEquals(self.expected_args, self.saved_args)
 
     def test_populate_boot_no_bootloader_flavor(self):
-        self.prepare_config(boards.BoardConfig)
+        self.prepare_config(BoardConfig())
         self.config.bootloader_file_in_boot_part = True
         self.assertRaises(
             AssertionError, self.call_populate_boot, self.config)
@@ -3612,10 +3541,7 @@
         os.makedirs(os.path.join(tempdir, 'etc', 'network'))
         if_path = os.path.join(tempdir, 'etc', 'network', 'interfaces')
 
-        class board_config(boards.BoardConfig):
-            pass
-
-        update_network_interfaces(tempdir, board_config)
+        update_network_interfaces(tempdir, BoardConfig())
         self.assertFalse(os.path.exists(if_path))
 
     def test_update_interfaces_creates_entry(self):
@@ -3626,12 +3552,12 @@
         os.makedirs(os.path.join(tempdir, 'etc', 'network'))
         if_path = os.path.join(tempdir, 'etc', 'network', 'interfaces')
 
-        class board_config(boards.BoardConfig):
-            wired_interfaces = ['eth0']
+        board_conf = BoardConfig()
+        board_conf.wired_interfaces = ['eth0']
 
         expected = 'auto eth0\n' \
             'iface eth0 inet dhcp\n'
-        update_network_interfaces(tempdir, board_config)
+        update_network_interfaces(tempdir, board_conf)
         self.assertEqual(expected, open(if_path).read())
 
     def test_update_interfaces_creates_entries(self):
@@ -3642,14 +3568,14 @@
         os.makedirs(os.path.join(tempdir, 'etc', 'network'))
         if_path = os.path.join(tempdir, 'etc', 'network', 'interfaces')
 
-        class board_config(boards.BoardConfig):
-            wired_interfaces = ['eth0', 'eth1']
-            wireless_interfaces = ['wlan0']
+        board_conf = BoardConfig()
+        board_conf.wired_interfaces = ['eth0', 'eth1']
+        board_conf.wireless_interfaces = ['wlan0']
 
         expected = 'auto %(if)s\n' \
             'iface %(if)s inet dhcp\n'
 
-        update_network_interfaces(tempdir, board_config)
+        update_network_interfaces(tempdir, board_conf)
         self.assertIn(expected % {'if': 'eth1'}, open(if_path).read())
         self.assertIn(expected % {'if': 'eth0'}, open(if_path).read())
         self.assertIn(expected % {'if': 'wlan0'}, open(if_path).read())
@@ -3664,13 +3590,13 @@
         with open(if_path, 'w') as interfaces:
             interfaces.write('Original contents of file.\n')
 
-        class board_config(boards.BoardConfig):
-            wired_interfaces = ['eth0']
+        board_conf = BoardConfig()
+        board_conf.wired_interfaces = ['eth0']
 
         expected = 'Original contents of file.\n' \
             'auto eth0\n' \
             'iface eth0 inet dhcp\n'
-        update_network_interfaces(tempdir, board_config)
+        update_network_interfaces(tempdir, board_conf)
         self.assertEqual(expected, open(if_path).read())
 
     def test_write_data_to_protected_file(self):

=== modified file 'linaro_image_tools/tests/__init__.py'
--- linaro_image_tools/tests/__init__.py	2012-06-07 13:22:47 +0000
+++ linaro_image_tools/tests/__init__.py	2013-01-03 13:57:23 +0000
@@ -1,3 +1,20 @@
+# Copyright (C) 2010, 2011, 2012 Linaro
+#
+# This file is part of Linaro Image Tools.
+#
+# Linaro Image Tools is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Linaro Image Tools is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import os
 import unittest