bbb: use boneblack u-boot config for eMMC storage

The boneblack u-boot config adds support for environment storage
in eMMC. Kernel image type is changed to zImage to reflect which
is what the u-boot defaults to. For older versions of u-boot that
try to use uImage, set extra u-boot arguments in uEnv.txt.

Change-Id: I98bd37db41a7c80a1aa75e9ae53c1e00589fde64
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>

3 files changed, 8 insertions, 0 deletions

diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index a68a8d5..2198d90 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -30,6 +30,8 @@ PREFERRED_VERSION_libgles-omap3 = "4.10.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
 
 EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
+UBOOT_MACHINE = "am335x_boneblack_config"
+KERNEL_IMAGETYPE = "zImage"
 
 MACHINE_EXTRA_INSTALL = "\
         libgles-omap3 \
diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
index e5518bc..f91ea8e 100644
--- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
+++ b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend
@@ -6,3 +6,4 @@ SRC_URI += "\
     "
 
 INSANE_SKIP_${PN} = "installed-vs-shipped"
+KERNEL_IMAGETYPE = "zImage"
diff --git a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
index 6b23df1..d41ef60 100644
--- a/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
+++ b/meta-beagleboard-extras/recipes/u-boot/u-boot-uenv-script/uEnv.txt
@@ -1 +1,6 @@
 optargs=consoleblank=0 vt.global_cursor_default=0 quiet
+# extra options to support older u-boot (2013)
+bootfile=zImage
+loadaddr=0x80200000
+loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
+mmcboot=echo Booting from mmc ...; run mmcargs; bootz ${loadaddr} - ${fdtaddr}