Merge lp:~mabac/linaro-images/hwpack.oneiric.linaro-igep into lp:~linaro-maintainers/linaro-images/hwpack.oneiric.linaro-igep

[Mattias Backman]

Hi,

This changes the x_loader fields to spl to match the updated branch at https://code.launchpad.net/~mabac/linaro-image-tools/use-spl-for-xloader/+merge/76401.

This will not work with trunk of l-i-t until that's been merged.

Thanks,

Mattias

[Loïc Minier (lool)]

LGTM, maybe LT tech leads needs to ack the change though

[Ricardo Salveti (rsalveti)]

A similar change is already applied, but thanks for the merge request.

Unmerged revisions

31. By Mattias Backman on 2011-09-22

Change x_loader fields to spl and add mmc_id.

=== modified file 'hwpacks/linaro-igep'
--- hwpacks/linaro-igep	2011-09-19 09:51:50 +0000
+++ hwpacks/linaro-igep	2011-09-22 12:34:25 +0000
@@ -10,8 +10,9 @@
 u_boot_package=u-boot-linaro-igep0020
 u_boot_file=usr/lib/u-boot/igep0020/u-boot.bin
 u_boot_in_boot_part=Yes
-x_loader_package=x-loader-omap3-igepv2
-x_loader_file=usr/lib/x-loader/igep00x0/MLO
+spl_package=x-loader-omap3-igepv2
+spl_file=usr/lib/x-loader/igep00x0/MLO
+mmc_id=0:1
 kernel_addr=0x80000000
 initrd_addr=0x81600000
 load_addr=0x80008000