Merge lp:~tixy/linaro-image-tools/vexpress-uboot-addresses-fix into lp:linaro-image-tools/11.11

[Tixy (Jon Medhurst)]

[Loïc Minier (lool)]

 review: approve

 Looks good to me; thanks

--
Loïc Minier

review: Approve

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-11-21 14:34:49 +0000
+++ linaro_image_tools/media_create/boards.py	2011-11-23 13:45:22 +0000
@@ -1265,9 +1265,9 @@
     serial_tty = 'ttyAMA0'
     _extra_serial_opts = 'console=tty0 console=%s,38400n8'
     _live_serial_opts = 'serialtty=%s'
-    kernel_addr = '0x60008000'
-    initrd_addr = '0x81000000'
-    load_addr = kernel_addr
+    kernel_addr = '0x60000000'
+    initrd_addr = '0x62000000'
+    load_addr = '0x60008000'
     kernel_flavors = ['linaro-vexpress']
     boot_script = 'boot.scr'
     # ARM Boot Monitor is used to load u-boot, uImage etc. into flash and

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-11-21 14:34:49 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-11-23 13:45:22 +0000
@@ -1232,9 +1232,9 @@
         expected = {
             'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
                         'console=ttyXXX  root=UUID=deadbeef rootwait ro',
-            'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; '
-                       'fatload mmc 0:1 0x81000000 uInitrd; '
-                       'bootm 0x60008000 0x81000000'}
+            'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; '
+                       'fatload mmc 0:1 0x62000000 uInitrd; '
+                       'bootm 0x60000000 0x62000000'}
         self.assertEqual(expected, boot_commands)
 
     def test_vexpress_a9(self):
@@ -1244,9 +1244,9 @@
         expected = {
             'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
                         'console=ttyXXX  root=UUID=deadbeef rootwait ro',
-            'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; '
-                       'fatload mmc 0:1 0x81000000 uInitrd; '
-                       'bootm 0x60008000 0x81000000'}
+            'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; '
+                       'fatload mmc 0:1 0x62000000 uInitrd; '
+                       'bootm 0x60000000 0x62000000'}
         self.assertEqual(expected, boot_commands)
 
     def test_mx51(self):
@@ -1467,9 +1467,9 @@
         expected = {
             'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
                         'rootwait ro init=/init androidboot.console=ttyAMA0',
-            'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; '
-                       'fatload mmc 0:1 0x81000000 uInitrd; '
-                       'bootm 0x60008000 0x81000000'}
+            'bootcmd': 'fatload mmc 0:1 0x60000000 uImage; '
+                       'fatload mmc 0:1 0x62000000 uInitrd; '
+                       'bootm 0x60000000 0x62000000'}
         self.assertEqual(expected, boot_commands)