From 51a3144f603f91122b95f34e9c5af6e4566daa0e Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 7 Oct 2013 15:31:47 +0200 Subject: u-boot: clean up recipe --- recipes-bsp/u-boot/u-boot_2011.06.bbappend | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'recipes-bsp/u-boot') diff --git a/recipes-bsp/u-boot/u-boot_2011.06.bbappend b/recipes-bsp/u-boot/u-boot_2011.06.bbappend index f8c3ac2..0c7b31d 100644 --- a/recipes-bsp/u-boot/u-boot_2011.06.bbappend +++ b/recipes-bsp/u-boot/u-boot_2011.06.bbappend @@ -15,7 +15,8 @@ DEFAULT_PREFERENCE_apalis-t30 = "1" FILESPATHPKG =. "git:" S="${WORKDIR}/git" -SRC_URI_COLIBRI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=colibri file://u-boot-dont-build-standalone.patch" +SRC_URI_COLIBRI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=colibri" +#SRC_URI_COLIBRI += "file://u-boot-dont-build-standalone.patch" SRCREV_COLIBRI = "d7fcf63504425a73f74f3d1d2f5ba68533280ff4" PV_colibri-t20 = "${PR}+gitr${SRCREV}" @@ -25,26 +26,28 @@ PV_apalis-t30 = "${PR}+gitr${SRCREV}" SRC_URI_colibri-t20 = "${SRC_URI_COLIBRI}" SRC_URI_colibri-t30 = "${SRC_URI_COLIBRI}" SRC_URI_apalis-t30 = "${SRC_URI_COLIBRI}" + SRCREV_colibri-t20 = "${SRCREV_COLIBRI}" SRCREV_colibri-t30 = "${SRCREV_COLIBRI}" SRCREV_apalis-t30 = "${SRCREV_COLIBRI}" -PV_colibri-t20 = "${PR}+gitr${SRCREV}" -PV_colibri-t30 = "${PR}+gitr${SRCREV}" -PV_apalis-t30 = "${PR}+gitr${SRCREV}" # override the solution passed in from u-boot.inc as we want to set additional flags EXTRA_OEMAKE_colibri-t20 = "CROSS_COMPILE=${TARGET_PREFIX}" EXTRA_OEMAKE_colibri-t30 = "CROSS_COMPILE=${TARGET_PREFIX}" EXTRA_OEMAKE_apalis-t30 = "CROSS_COMPILE=${TARGET_PREFIX}" -#build additionally a u-boot binary which uses/stores its environment on an T20 external sd or mmc card +# colibri-t20: build additionally a u-boot binary which uses/stores its environment on an T20 external sd or mmc card SPL_BINARY_colibri-t20 = "u-boot-hsmmc.bin" -SPL_IMAGE_colibri-t20 = "u-boot-hsmmc-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -SPL_SYMLINK_colibri-t20 = "u-boot-hsmmc-${MACHINE}.${UBOOT_SUFFIX}" +SPL_IMAGE_colibri-t20 = "u-boot-hsmmc-${MACHINE}-${PV}-${PR}.bin" +SPL_SYMLINK_colibri-t20 = "u-boot-hsmmc-${MACHINE}.bin" do_compile_append_colibri-t20() { - mv u-boot.bin u-boot-nand.bin - oe_runmake colibri_t20_sdboot_config - oe_runmake all - mv u-boot.bin u-boot-hsmmc.bin - mv u-boot-nand.bin u-boot.bin + # keep u-boot-nand + mv u-boot.bin u-boot-nand.bin + oe_runmake colibri_t20_sdboot_config + oe_runmake ${UBOOT_MAKE_TARGET} + mv u-boot.bin u-boot-hsmmc.bin + mv u-boot-nand.bin u-boot.bin } + +#do_install_append() { +#} -- cgit v1.2.3