summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuy Dang <duy.dang.yw@renesas.com>2019-05-10 14:05:37 +0700
committerKhang Nguyen <khang.nguyen.xw@renesas.com>2019-07-31 15:18:49 +0700
commit80bdcd44f8d21bd888d8a6b6887fdde9f9b7bd41 (patch)
tree55e94aa3e3ab09a088369a7211a24d6c5a52ca01
parentaf944d7536c5b9478667258111a965a9ee593a97 (diff)
rcar-gen3: u-boot: Update U-Boot version to 3.9.5
This commit updates U-Boot version to 3.9.5 for the following changes: - Fix name to AVB_AVTP_{MATCH/CAPTURE}. - Add DRAM 2x4G memory map support for M3 Ver.3.0 SiP. (cherry picked from commit fd9043582dff30021c8068e91cab577518f44205) Change-Id: I4071c3d3976a011e096482ea3adc642af9e12c19 Signed-off-by: Duy Dang <duy.dang.yw@renesas.com> Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
-rw-r--r--meta-rcar-gen3/conf/machine/salvator-x.conf3
-rw-r--r--meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb4
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
index f2555c6..27cbf4e 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -62,9 +62,10 @@ UBOOT_CONFIG[r8a7795_salvator-xs] = "r8a7795_salvator-xs_defconfig"
UBOOT_CONFIG[r8a7795_salvator-xs-2x2g] = "r8a7795_salvator-xs-2x2g_defconfig"
UBOOT_CONFIG[r8a7795_salvator-xs-4x2g] = "r8a7795_salvator-xs-4x2g_defconfig"
# M3 u-boot configure
-UBOOT_CONFIG_r8a7796 ??= "r8a7796_salvator-x r8a7796_salvator-xs"
+UBOOT_CONFIG_r8a7796 ??= "r8a7796_salvator-x r8a7796_salvator-xs r8a7796_salvator-xs-2x4g"
UBOOT_CONFIG[r8a7796_salvator-x] = "r8a7796_salvator-x_defconfig"
UBOOT_CONFIG[r8a7796_salvator-xs] = "r8a7796_salvator-xs_defconfig"
+UBOOT_CONFIG[r8a7796_salvator-xs-2x4g] = "r8a7796_salvator-xs-2x4g_defconfig"
# M3N u-boot configure
UBOOT_CONFIG_r8a77965 ??= "r8a77965_salvator-x r8a77965_salvator-xs"
UBOOT_CONFIG[r8a77965_salvator-x] = "r8a77965_salvator-x_defconfig"
diff --git a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb
index dc9d167..da155ce 100644
--- a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb
+++ b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb
@@ -4,10 +4,10 @@ require u-boot.inc
DEPENDS += "bc-native dtc-native"
UBOOT_URL = "git://github.com/renesas-rcar/u-boot.git"
-BRANCH = "v2018.09/rcar-3.9.3"
+BRANCH = "v2018.09/rcar-3.9.5"
SRC_URI = "${UBOOT_URL};branch=${BRANCH}"
-SRCREV = "2b858f59e82177c8aba621b26629d797db2b7cc7"
+SRCREV = "33049e0f28708289ade19d09a51ba278f6ddbe1c"
PV = "v2018.09+git${SRCPV}"
UBOOT_SREC_SUFFIX = "srec"