diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 403: Set initrd_high and fdt_high u-boot env vars on Panda.

Message ID 20110810224421.29548.2184.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

James Westby Aug. 10, 2011, 10:44 p.m. UTC 
Merge authors:
  David Long (dave-long)
Related merge proposals:
  https://code.launchpad.net/~dave-long/linaro-image-tools/fix-panda-u-boot/+merge/67554
  proposed by: David Long (dave-long)
  review: Approve - Ricardo Salveti (rsalveti)
  review: Approve - James Tunnicliffe (dooferlad)
------------------------------------------------------------
revno: 403 [merge]
committer: James Westby <james.westby@linaro.org>
branch nick: trunk
timestamp: Wed 2011-08-10 18:42:02 -0400
message:
  Set initrd_high and fdt_high u-boot env vars on Panda.
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-07-28 01:02:24 +0000
+++ linaro_image_tools/media_create/boards.py	2011-08-10 22:42:02 +0000
@@ -1201,6 +1201,8 @@ 
     # https://bugs.launchpad.net/linaro-image-tools/+bug/788765
     # for more.
     return (
+        'setenv initrd_high "0xffffffff"\n'
+        'setenv fdt_high "0xffffffff"\n'
         'setenv bootcmd "%(bootcmd)s"\n'
         'setenv bootargs "%(bootargs)s"\n'
         "boot"

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-07-28 10:43:00 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-08-10 22:42:02 +0000
@@ -1480,6 +1480,8 @@ 
         boot_env = {'bootargs': 'mybootargs', 'bootcmd': 'mybootcmd'}
         boot_script_data = get_plain_boot_script_contents(boot_env)
         self.assertEqual(textwrap.dedent("""\
+            setenv initrd_high "0xffffffff"
+            setenv fdt_high "0xffffffff"
             setenv bootcmd "mybootcmd"
             setenv bootargs "mybootargs"
             boot"""), boot_script_data)