barebox: use uImage instead of zImage

Also move to a combined branch for sysmobts and sysmocom-odu. Disable
bootloader spec support as well.

Signed-off-by: Jan Luebbe <jluebbe@debian.org>

recipes-bsp/barebox/barebox-sysmobts_git.bb

@@ -1,8 +1,8 @@
 require barebox.inc
 
-SRCREV = "045022f36e4d83396ee3b518d0d3bc5cd9b80ee9"
+SRCREV = "6825fb56576b78be47a1dae292bac14ec18bdd2e"
 SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.05-sysmobts \
+	git://git.sysmocom.de/barebox.git;branch=v2015.05 \
 	file://defconfig \
 	"
 

recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb

@@ -1,8 +1,8 @@
 require barebox.inc
 
-SRCREV = "c0a4bb242bde34a4f1debb574e5cc44c9b4894ca"
+SRCREV = "6825fb56576b78be47a1dae292bac14ec18bdd2e"
 SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.05-sysmocom-odu \
+	git://git.sysmocom.de/barebox.git;branch=v2015.05 \
 	file://defconfig \
 	"
 

recipes-bsp/barebox/barebox-sysmocom-odu/defconfig

@@ -151,7 +151,7 @@ CONFIG_PASSWD_CRYPTO_PBKDF2=y
 CONFIG_DYNAMIC_CRC_TABLE=y
 CONFIG_ERRNO_MESSAGES=y
 # CONFIG_TIMESTAMP is not set
-CONFIG_BLSPEC=y
+# CONFIG_BLSPEC is not set
 CONFIG_IMD=y
 CONFIG_IMD_TARGET=y
 # CONFIG_KERNEL_INSTALL_TARGET is not set

recipes-bsp/barebox/barebox-sysmocom-odu_git.bb

@@ -2,9 +2,9 @@ require barebox.inc
 
 RDEPENDS_${PN} += "${PN}-mlo"
 
-SRCREV = "c0a4bb242bde34a4f1debb574e5cc44c9b4894ca"
+SRCREV = "6825fb56576b78be47a1dae292bac14ec18bdd2e"
 SRC_URI = " \
-	git://git.sysmocom.de/barebox.git;branch=v2015.05-sysmocom-odu \
+	git://git.sysmocom.de/barebox.git;branch=v2015.05 \
 	file://defconfig \
 	"