Linaro Image Tools

Merge lp:~berolinux/linaro-image-tools/android-imx53-support into lp:linaro-image-tools/11.11

  1. android-imx53-support
  2. Merge into trunk
Proposed by Bernhard Rosenkraenzer
Status: Merged
Merged at revision: 397
Proposed branch: lp:~berolinux/linaro-image-tools/android-imx53-support
Merge into: lp:linaro-image-tools/11.11
Diff against target: 34 lines (+4/-2)
2 files modified
linaro-android-media-create (+3/-1)
linaro_image_tools/media_create/android_boards.py (+1/-1)
To merge this branch: bzr merge lp:~berolinux/linaro-image-tools/android-imx53-support
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+69576@code.launchpad.net

Description of the change

This is the last bits and pieces needed to create a bootable Android SD card for the i.MX53 QSB.
install_boot_loader needs to be called with the boot partition mounted, and the file that must be dd-ed to 0400 is u-boot.imx, not u-boot.bin (I've fixed the i.MX53 builds to create the u-boot.imx file too).

With these 2 changes, we can finally create an i.MX53 Android build that boots automatically.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Looks ok to me.

Thanks,

James

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro-android-media-create'
2--- linaro-android-media-create 2011-07-26 15:35:22 +0000
3+++ linaro-android-media-create 2011-07-28 00:38:25 +0000
4@@ -33,6 +33,7 @@
5 setup_partitions,
6 setup_android_partitions,
7 get_uuid,
8+ partition_mounted,
9 )
10 from linaro_image_tools.media_create.rootfs import populate_partition
11 from linaro_image_tools.media_create.unpack_binary_tarball import (
12@@ -142,7 +143,8 @@
13 board_config.populate_raw_partition(args.device, BOOT_DIR)
14 populate_partition(BOOT_DIR + "/boot", BOOT_DISK, boot_partition)
15 board_config.populate_boot_script(boot_partition, BOOT_DISK, args.consoles)
16- board_config.install_boot_loader(args.device, BOOT_DISK)
17+ with partition_mounted(boot_partition, BOOT_DISK):
18+ board_config.install_boot_loader(args.device, BOOT_DISK)
19 populate_partition(SYSTEM_DIR + "/system", SYSTEM_DISK, system_partition)
20 populate_partition(DATA_DIR + "/data", DATA_DISK, data_partition)
21 print "Done creating Linaro Android image on %s" % args.device
22
23=== modified file 'linaro_image_tools/media_create/android_boards.py'
24--- linaro_image_tools/media_create/android_boards.py 2011-07-26 15:35:22 +0000
25+++ linaro_image_tools/media_create/android_boards.py 2011-07-28 00:38:25 +0000
26@@ -238,7 +238,7 @@
27
28 @classmethod
29 def install_boot_loader(cls, boot_partition, boot_device_or_file):
30- install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.bin"), boot_partition, cls.LOADER_MIN_SIZE_S)
31+ install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)
32
33 android_board_configs = {
34 'beagle': AndroidBeagleConfig,

Subscribers

People subscribed via source and target branches