From ca80cc5603eb810c8f47694f553b13ff79060ff1 Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Sat, 23 Dec 2017 11:22:17 +0700 Subject: rcar-gen3: u-boot: Upgrade version to v3.6.0 and adapt to rocko u-boot headers This commit updates u-boot version corresponding to BSP v3.6.0 for below fixes: - Add CONFIG_CMD_CACHE for enabling cache control commands. - Fix clock bit assignment of EHCI3. - Store last address/size/etc as ulong. - Build warning fixes for 64-bit. - Add CONFIG_HUSH_PARSER for enabling the "hush" shell as command line interpreter. - Add eMMC ver.5.1 support. - Update MMC_ERASE argument to match Linux kernel. - Backport for gcc 7.2.0 compiler support. The u-boot.inc used by the bb recipe has been split into two parts in the pyro poky meta. Adopt to the new style by providing the missing u-boot-common*.inc file containing the license information. Signed-off-by: Stephen Lawrence Signed-off-by: Thuy Tran Signed-off-by: Takamitsu Honda --- meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2015.04.inc | 8 ++++++++ meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2015.04.inc (limited to 'meta-rcar-gen3/recipes-bsp/u-boot') diff --git a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2015.04.inc b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2015.04.inc new file mode 100644 index 0000000..21304be --- /dev/null +++ b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2015.04.inc @@ -0,0 +1,8 @@ +HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" +SECTION = "bootloaders" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +PE = "1" + +S = "${WORKDIR}/git" diff --git a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb index aff61ae..b8ed7c3 100644 --- a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb +++ b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb @@ -1,14 +1,13 @@ +require recipes-bsp/u-boot/u-boot-common_${PV}.inc require recipes-bsp/u-boot/u-boot.inc DEPENDS += "dtc-native" UBOOT_URL = "git://github.com/renesas-rcar/u-boot.git" -BRANCH = "v2015.04/rcar-3.5.9" - -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +BRANCH = "v2015.04/rcar-3.6.0" SRC_URI = "${UBOOT_URL};branch=${BRANCH}" -SRCREV = "24add58d915191d901915a6a8cc44faa748fcaa2" +SRCREV = "eaf09736bb2f1458e19ae0c3176b97ec3aa00219" PV = "v2015.04+git${SRCPV}" @@ -19,7 +18,7 @@ UBOOT_SREC_IMAGE ?= "u-boot-elf-${MACHINE}-${PV}-${PR}.srec" UBOOT_SREC_SYMLINK ?= "u-boot-elf-${MACHINE}.srec" do_deploy_append() { - install -m 644 ${S}/${UBOOT_SREC} ${DEPLOYDIR}/${UBOOT_SREC_IMAGE} + install -m 644 ${B}/${UBOOT_SREC} ${DEPLOYDIR}/${UBOOT_SREC_IMAGE} cd ${DEPLOYDIR} rm -f ${UBOOT_SREC} ${UBOOT_SREC_SYMLINK} ln -sf ${UBOOT_SREC_IMAGE} ${UBOOT_SREC_SYMLINK} -- cgit 1.2.3-korg