diff options
author | Matt Porter <mporter@konsulko.com> | 2017-12-11 11:33:27 -0500 |
---|---|---|
committer | Matt Porter <mporter@konsulko.com> | 2017-12-11 19:23:45 -0500 |
commit | 066101861db63e23384286feb638d27689a9b8d5 (patch) | |
tree | 9ba02da660e6f01494150555fcc468637e65207a | |
parent | 883a75bd4c5382d50d7fbb154c1e87a6ea8413b8 (diff) |
u-boot: switch to rcar-3.5.9 branch
Signed-off-by: Matt Porter <mporter@konsulko.com>
-rw-r--r-- | meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot/0016-tools-fix-build-fail.patch | 29 | ||||
-rw-r--r-- | meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend | 4 |
2 files changed, 3 insertions, 30 deletions
diff --git a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot/0016-tools-fix-build-fail.patch b/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot/0016-tools-fix-build-fail.patch deleted file mode 100644 index ab66851..0000000 --- a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot/0016-tools-fix-build-fail.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 34b8d92c5139b37322548cc41c5c3a788c51d3ad Mon Sep 17 00:00:00 2001 -From: Vladimir Barinov <vladimir.barinov@cogentembedded.com> -Date: Tue, 2 May 2017 12:55:23 +0300 -Subject: [PATCH] tools: fix build fail - -Build fail fix for CONFIG_ENV_IS_IN_SPI_FLASH - -Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com> ---- - tools/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index 4bbb153..12719ac 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -211,7 +211,8 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ - -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ - -DUSE_HOSTCC \ - -D__KERNEL_STRICT_NAMES \ -- -D_GNU_SOURCE -+ -D_GNU_SOURCE \ -+ -include $(srctree)/include/generated/autoconf.h - - __build: $(LOGO-y) - --- -1.9.1 - diff --git a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend b/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend index 8171d10..044c598 100644 --- a/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend +++ b/meta-rcar-gen3-adas/recipes-bsp/u-boot/u-boot_2015.04.bbappend @@ -1,5 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +BRANCH = "v2015.04/rcar-3.5.9" +SRCREV = "24add58d915191d901915a6a8cc44faa748fcaa2" + SRC_URI_append = " \ file://0001-net-phy-support-fixed-PHY.patch \ ${@bb.utils.contains('MACHINE_FEATURES', 'h3ulcb-had', ' file://0002-net-ravb-remove-APSR-quirk.patch', '', d)} \ @@ -15,7 +18,6 @@ SRC_URI_append = " \ file://0013-mtd-spi-QSPI-flash-support.patch \ file://0014-arm-renesas-Add-Renesas-R8A7797-SoC-support.patch \ file://0015-board-renesas-Add-V3M-Eagle-board.patch \ - file://0016-tools-fix-build-fail.patch \ file://0017-board-renesas-Add-V3MSK-board.patch \ file://0021-ARM-rcar_gen3-Add-RPC-flash-definitions.patch \ file://0022-mtd-Add-RPC-HyperFlash-support.patch \ |