diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 469: Merge lp:~tixy/linaro-image-tools/vexpress-uboot-addresses-fix; fixes load

Message ID 20111123142316.6336.68961.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

loic.minier@linaro.org Nov. 23, 2011, 2:23 p.m. UTC 
Merge authors:
  Tixy (Jon Medhurst) (tixy)
Related merge proposals:
  https://code.launchpad.net/~tixy/linaro-image-tools/vexpress-uboot-addresses-fix/+merge/83167
  proposed by: Tixy (Jon Medhurst) (tixy)
  review: Approve - Loïc Minier (lool)
------------------------------------------------------------
revno: 469 [merge]
committer: Loïc Minier <lool@dooz.org>
branch nick: linaro-image-tools
timestamp: Wed 2011-11-23 15:14:58 +0100
message:
  Merge lp:~tixy/linaro-image-tools/vexpress-uboot-addresses-fix; fixes load
  addresses on vexpress.
modified:
  linaro_image_tools/media_create/boards.py
  linaro_image_tools/media_create/tests/test_media_create.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== 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 12:49:03 +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 12:49:03 +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)