From 7452c06055960fd858884ad2c118d3b6a277cc94 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Tue, 5 Oct 2021 12:51:16 -0400
Subject: [PATCH] meta-agl-bsp: reference hardware updates for BSP v5.5.0

Update the AGL reference hardware devicetree and U-Boot configuration
names to work with the Renesas BSP v5.5.0 update and related
meta-agl-refhw changes.

Bug-AGL: SPEC-4103

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
(cherry picked from commit fe29f1717f6ee309273507724c488a6b5fbb5598)
Change-Id: I94db9390c2ec3d2b0cd9b1c0167570d813f2bae3
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26867
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---
 meta-agl-bsp/conf/include/agl_refhw-h3.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-agl-bsp/conf/include/agl_refhw-h3.inc b/meta-agl-bsp/conf/include/agl_refhw-h3.inc
index 54470a948..1280c6c6a 100644
--- a/meta-agl-bsp/conf/include/agl_refhw-h3.inc
+++ b/meta-agl-bsp/conf/include/agl_refhw-h3.inc
@@ -3,10 +3,10 @@ AGL_FEATURES_append = " agl-refhw-h3"
 # Reference hardware has USB3
 MACHINE_FEATURES_append = " usb3"
 
-KERNEL_DEVICETREE_append = " renesas/r8a7795-agl-refhw.dtb"
+KERNEL_DEVICETREE_append = " renesas/r8a77951-agl-refhw.dtb"
 
-UBOOT_CONFIG_append = " agl-refhw-4x2g"
-UBOOT_CONFIG[agl-refhw-4x2g] = "r8a7795_salvator-xs-4x2g_defconfig"
+UBOOT_CONFIG_append = " agl-refhw"
+UBOOT_CONFIG[agl-refhw] = "rcar3_salvator-x_defconfig"
 
 MACHINE_EXTRA_RRECOMMENDS_append_h3ulcb = " \
     linux-firmware-wl18xx \
-- 
2.16.6