diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb index 93745ba4..380f5676 100644 --- a/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb @@ -7,29 +7,26 @@ DESCRIPTION = "u-boot bootloader for TI devices" LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" -PR = "r10" +PR = "r11" PV_append = "+git${SRCPV}" SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}" BRANCH ?= "ti-u-boot-2015.07" -SRCREV = "d49aa5effa20d0b943c74ced84e67defce6d6d1c" +SRCREV = "75d995e87f47902b40065982ccbaae7a466d0913" SPL_BINARY = "MLO" SPL_UART_BINARY = "u-boot-spl.bin" # Keystone specifics UBOOT_SUFFIX_keystone = "bin" -UBOOT_MAKE_TARGET_keystone = "u-boot-spi.gph u-boot-nand.gph" -SPL_BINARY_keystone = "" SPL_UART_BINARY_keystone = "" # SPI NOR Flash binaries UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin" UBOOT_SPI_BINARY = "u-boot.img" UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph" -UBOOT_NAND_GPH_BINARY = "u-boot-nand.gph" # SPI NOR Flash deployed images UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin" @@ -38,8 +35,6 @@ UBOOT_SPI_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img" UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img" UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph" UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph" -UBOOT_NAND_GPH_IMAGE = "u-boot-nand-${MACHINE}-${PV}-${PR}.gph" -UBOOT_NAND_GPH_SYMLINK = "u-boot-nand-${MACHINE}.gph" do_install_append_keystone () { install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE} @@ -50,9 +45,6 @@ do_install_append_keystone () { install ${S}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE} ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY} - - install ${S}/${UBOOT_NAND_GPH_BINARY} ${D}/boot/${UBOOT_NAND_GPH_IMAGE} - ln -sf ${UBOOT_NAND_GPH_IMAGE} ${D}/boot/${UBOOT_NAND_GPH_BINARY} } do_deploy_append_keystone () { @@ -70,9 +62,4 @@ do_deploy_append_keystone () { rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK} ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK} ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY} - - install ${S}/${UBOOT_NAND_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_NAND_GPH_IMAGE} - rm -f ${UBOOT_NAND_GPH_BINARY} ${UBOOT_NAND_GPH_SYMLINK} - ln -sf ${UBOOT_NAND_GPH_IMAGE} ${UBOOT_NAND_GPH_SYMLINK} - ln -sf ${UBOOT_NAND_GPH_IMAGE} ${UBOOT_NAND_GPH_BINARY} }