--- media_create_original/boards.py	2011-04-04 16:32:57.029231109 +0200
+++ media_create/boards.py	2011-04-02 16:06:05.074967005 +0200
@@ -429,7 +429,7 @@
     kernel_addr = '0x00100000'
     initrd_addr = '0x08000000'
     load_addr = '0x00008000'
-    kernel_suffix = 'u?500'
+    kernel_suffix = 'ux500'
     boot_script = 'flash.scr'
     extra_boot_args_options = (
         'earlyprintk rootdelay=1 fixrtc nocompcache '
@@ -447,6 +447,108 @@
         make_boot_script(boot_env, boot_script_path)
 
 
+class SnowballConfig(Ux500Config):
+    # Boot ROM looks for a boot table of contents (TOC) at 0x20000
+    # Actually, it first looks at address 0, but that's where l-m-c
+    # puts the MBR, so the boot loader skips that address. 
+    LOADER_START_S = (128 * 1024) / SECTOR_SIZE
+
+
+    @classmethod
+    def get_sfdisk_cmd(cls, should_align_boot_part=None):
+        """Return the sfdisk command to partition the media.
+
+        :param should_align_boot_part: Ignored.
+
+        This Snowball implementation returns a non-FS data bootloader partition,
+        followed by a FAT32 boot partition, followed by a root partition.
+        """
+        # boot ROM expects bootloader at 0x20000, which is sector 0x100 
+        # with the usual SECTOR_SIZE of 0x200.
+        # (sector 0 is MBR / partition table)
+        loader_start, loader_end, loader_len = align_partition(
+            SnowballConfig.LOADER_START_S, LOADER_MIN_SIZE_S, 1, PART_ALIGN_S)
+        boot_start, boot_end, boot_len = align_partition(
+            loader_end + 1, BOOT_MIN_SIZE_S, PART_ALIGN_S, PART_ALIGN_S)
+        # we ignore _root_end / _root_len and return an sfdisk command to
+        # instruct the use of all remaining space; XXX if we had some root size
+        # config, we could do something more sensible
+        root_start, _root_end, _root_len = align_partition(
+            boot_end + 1, ROOT_MIN_SIZE_S, PART_ALIGN_S, PART_ALIGN_S)
+
+        return '%s,%s,0xDA\n%s,%s,0x0C,*\n%s,,,-' % (
+            loader_start, loader_len, boot_start, boot_len, root_start)
+
+
+    @classmethod
+    def get_file_info(cls, bin_dir, files):
+        ''' Fills in the offsets of files that are located in
+            non-absolute memory locations depending on their sizes.'
+            Also fills in file sizes'''
+        toc_size = 512
+        ofs = toc_size
+        for i in range(len(files)):
+            section, filename, flag, address, sz = files[i]
+            filename = os.path.join(bin_dir, filename)
+            if address != 0:
+                ofs = address
+            size = os.path.getsize(filename)
+            files[i] = section, filename, flag, ofs, size
+            ofs += size
+        return files
+
+
+    @classmethod
+    def create_toc(cls, toc_filename, files):
+        ''' Writes a table of contents of the boot binaries.
+            Boot rom searches this table to find the binaries.'''
+        with open(toc_filename, 'wb') as f:
+            for item in files:
+                section, filename, flag, address, size = item
+                data = struct.pack('<IIIii12s', 
+                                   address,
+                                   size, 
+                                   0, flag, flag, 
+                                   section)
+                f.write(data)
+
+
+    @classmethod
+    def _make_boot_files(cls, uboot_parts_dir, boot_env, chroot_dir, boot_dir,
+                         boot_script_path, boot_device_or_file):
+        super(SnowballConfig, cls).make_boot_files(
+            uboot_parts_dir, boot_env, chroot_dir, boot_dir,
+            boot_script_path, boot_device_or_file)
+        toc_filename = 'toc.bin'
+        files = [('ISSW', 'issw.bin', -1, 0, 0),
+                 ('X-LOADER', 'xloader.bin', -1, 0, 0),
+                 ('MEM_INIT', 'meminit.bin', 0, 0x180000, 0),
+                 ('PWR_MGT', 'pwrmgt.bin', 0, 0x190000, 0),
+                 ('NORMAL', 'u-boot.bin', 0, 0xBC0000, 0) ]
+        new_files = cls.get_file_info(uboot_parts_dir, files)
+        print 'new files: ', new_files
+        cls.create_toc(toc_filename, new_files)
+        cls.install_boot_loader(toc_filename, new_files, boot_device_or_file)
+        os.remove(toc_filename)
+
+    @classmethod
+    def install_boot_loader(cls, toc_file_name, files, boot_device_or_file):
+        ''' Copies TOC and boot files into the boot partition.
+            A sector size of 1 is used for some files, as they do not
+            necessarily start on an even address. '''
+        _dd(toc_file_name, boot_device_or_file, seek=cls.LOADER_START_S)
+        for item in files:
+            section, filename, dummy_flag, offset, size = item
+            print 'offset is: ', offset
+            print 'mod:', offset % SECTOR_SIZE
+            if (offset % SECTOR_SIZE) != 0:
+                seek_bytes = cls.LOADER_START_S*SECTOR_SIZE + offset
+                _dd(filename, boot_device_or_file, block_size=1, seek=seek_bytes)
+            else:
+                seek_sectors = cls.LOADER_START_S+offset/SECTOR_SIZE
+                _dd(filename, boot_device_or_file, seek=seek_sectors)
+
+
 class Mx5Config(BoardConfig):
     serial_tty = 'ttymxc0'
     extra_serial_opts = 'console=tty0 console=%s,115200n8' % serial_tty
@@ -653,6 +755,7 @@
         cmd.append("seek=%s" % seek)
     if skip is not None:
         cmd.append("skip=%s" % skip)
+    print 'dd cmd: ', cmd
     proc = cmd_runner.run(cmd, as_root=True)
     proc.wait()