[RCAR] Update RCAR BSP recipes to 5.5.0 version

* rename the dts/dtsi file, the new BSP 5.5.0 change the file name of
  the dts file.
* update the driver files hash
* Add "meta-yocto-bsp" to BBLAYERS, it's new dependency of meta-renesas.

Bug-AGL: SPEC-4081

Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Change-Id: I53b71906e7174d7b1153a6912f7181171730147c
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26703
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-by: Stephane Desneux <stephane.desneux@iot.bzh>
Reviewed-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>

diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
index 3bc9f95..1ee0fe5 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar-nogfx.inc
 SOC_FAMILY = "r8a7795"
 BOARD_NAME = "h3-salvator-x"
 
-DTB_SUFFIX = "r8a7795-salvator-xs"
+DTB_SUFFIX = "r8a77951-salvator-xs"
 
 # Mask graphic Pkgs
 BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"

diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
index 48a2821..e7a8b46 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar.inc
 SOC_FAMILY = "r8a7795"
 BOARD_NAME = "h3-salvator-x"
 
-DTB_SUFFIX = "r8a7795-salvator-xs"
+DTB_SUFFIX = "r8a77951-salvator-xs"
 
 IMAGE_INSTALL:append:rcar-gen3 = " \
     kernel-module-vspmif \

diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
index 25dfb04..07a93df 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar-nogfx.inc
 SOC_FAMILY = "r8a7795"
 BOARD_NAME = "h3ulcb"
 
-DTB_SUFFIX = "r8a7795-h3ulcb"
+DTB_SUFFIX = "r8a77951-ulcb"
 
 # Mask graphic Pkgs
 BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"

diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index eb3836a..b958d76 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -2,4 +2,5 @@ require conf/include/agl_rcar.inc
 SOC_FAMILY = "r8a7795"
 BOARD_NAME = "h3ulcb"
 
-DTB_SUFFIX = "r8a7795-h3ulcb"
+#ws2.0
+DTB_SUFFIX = "r8a77951-ulcb"

diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
index f319e97..d2c4c05 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar-nogfx.inc
 SOC_FAMILY = "r8a7796"
 BOARD_NAME = "m3ulcb"
 
-DTB_SUFFIX = "r8a7796-m3ulcb"
+DTB_SUFFIX = "r8a77960-ulcb"
 
 # Mask graphic Pkgs
 BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"

diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 652a611..4f78832 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -2,7 +2,7 @@ require conf/include/agl_rcar.inc
 SOC_FAMILY = "r8a7796"
 BOARD_NAME = "m3ulcb"
 
-DTB_SUFFIX = "r8a7796-m3ulcb"
+DTB_SUFFIX = "r8a77960-ulcb"
 
 DISTRO_FEATURES:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}"
-IMAGE_INSTALL:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}"
\ No newline at end of file
+IMAGE_INSTALL:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}"

diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
index 64c9542..ac5e899 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch
@@ -1,7 +1,8 @@
-From ce9a7a41a9f65cc8cc129cdd27e155b35b26d393 Mon Sep 17 00:00:00 2001
+From a7d41cc40357d10cbb84ac463032f4d28af39162 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@konsulko.com>
 Date: Wed, 13 Dec 2017 12:49:20 -0500
-Subject: [PATCH] arm64: dts: renesas: preserve drm HDMI connector naming on KF
+Subject: [PATCH] arm64: dts: renesas: preserve drm HDMI connector naming
+ on KF
 
 Kingfisher adds encoders on ports 0 and 2 of the R-Car
 display unit. The bare ULCB SK has only an HDMI encoder
@@ -19,15 +20,28 @@ Change-Id: Ibbb1975c2383a526a54c257fb7d68d32a042d468
 Signed-off-by: Matt Porter <mporter@konsulko.com>
 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 10 +++++-----
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 10 +++++-----
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 10 +++++-----
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 10 +++++-----
+ 3 files changed, 15 insertions(+), 15 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index f7f947d27b0d..5bcc2391587d 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-@@ -3054,11 +3054,6 @@
+diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+index 655a71157a5f..c8aa7be0e33e 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+@@ -2373,6 +2373,11 @@ vin7csi41: endpoint@3 {
+                                               remote-endpoint = <&csi41vin7>;
+                                       };
+                               };
++                              port@0 {
++                                      reg = <0>;
++                                      du_out_rgb: endpoint {
++                                      };
++                              };
+                       };
+               };
+ 
+@@ -3955,11 +3960,6 @@ ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
  
@@ -39,8 +53,12 @@ index f7f947d27b0d..5bcc2391587d 100644
                                port@1 {
                                        reg = <1>;
                                        du_out_hdmi0: endpoint {
-@@ -3076,6 +3071,11 @@
-                                       du_out_lvds0: endpoint {
+diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+index 1b4099f571bd..22ef3d7047fd 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+@@ -2279,6 +2279,11 @@ vin7csi40: endpoint@2 {
+                                               remote-endpoint = <&csi40vin7>;
                                        };
                                };
 +                              port@0 {
@@ -51,11 +69,7 @@ index f7f947d27b0d..5bcc2391587d 100644
                        };
                };
  
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index df26656e0f19..154ac1dd91fa 100644
---- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-@@ -2846,11 +2846,6 @@
+@@ -3640,11 +3645,6 @@ ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
  
@@ -67,8 +81,12 @@ index df26656e0f19..154ac1dd91fa 100644
                                port@1 {
                                        reg = <1>;
                                        du_out_hdmi0: endpoint {
-@@ -2862,6 +2857,11 @@
-                                       du_out_lvds0: endpoint {
+diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+index ef2cb77f3c32..e1555d3673e2 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+@@ -2257,6 +2257,11 @@ vin7csi40: endpoint@2 {
+                                               remote-endpoint = <&csi40vin7>;
                                        };
                                };
 +                              port@0 {
@@ -79,6 +97,18 @@ index df26656e0f19..154ac1dd91fa 100644
                        };
                };
  
+@@ -3434,11 +3439,6 @@ ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+ 
+-                              port@0 {
+-                                      reg = <0>;
+-                                      du_out_rgb: endpoint {
+-                                      };
+-                              };
+                               port@1 {
+                                       reg = <1>;
+                                       du_out_hdmi0: endpoint {
 -- 
-2.11.0
+2.31.1
 

diff --git a/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc b/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc
index d95f36f..069643b 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc
+++ b/meta-agl-bsp/meta-rcar-gen3/include/checksum_control_files.inc
@@ -1,15 +1,15 @@
-CTL_CHECKSUM[r8a77951_linux_gsx_binaries_gles.tar.bz2]="e120465f9fd25115f70791ab4c6c343d"
-CTL_CHECKSUM[r8a77960_linux_gsx_binaries_gles.tar.bz2]="81eeac2320d37d9d4a74db6eb66aeec5"
-CTL_CHECKSUM[GSX_KM_H3.tar.bz2]="a858eaba7e0ff150b489502b36c01459"
-CTL_CHECKSUM[GSX_KM_M3.tar.bz2]="bc6e8268455e1911919cc1b6928fb12e"
-CTL_CHECKSUM[RCG3VUDRL4101ZDO.tar.bz2]="43a8921d5c2a257ccc0bf491c737f5be"
-CTL_CHECKSUM[RTM0AC0000ADAACMZ1SL41C.tar.gz]="4e0bb98feeb1e309a2ec12c201bc16aa"
-CTL_CHECKSUM[RTM0AC0000AEAACMZ1SL41C.tar.gz]="414c5fc22bcf848b5a6eee3812874611"
-CTL_CHECKSUM[RTM0AC0000XAAACD30SL41C.tar.gz]="e44c10bd24372fc70013c2498c6869d3"
-CTL_CHECKSUM[RTM0AC0000XAAACE30SL41C.tar.gz]="1611375916d9e17cff19c34b83300c83"
-CTL_CHECKSUM[RTM0AC0000XACMND30SL41C.tar.gz]="6229f43b2260d194f663bceed16ca273"
-CTL_CHECKSUM[RTM0AC0000XCMCTL30SL41C.tar.bz2]="516f86033669537a162220c773cb972d"
-CTL_CHECKSUM[RTM0AC0000XV264D30SL41C.tar.bz2]="b9e4e0d6dc65f65d21079b88824d6de3"
-CTL_CHECKSUM[RTM0AC0000XV264E30SL41C.tar.bz2]="3f2cd1aa774ce4bc980ef1b2cc4a77cf"
-CTL_CHECKSUM[RTM0AC0000XVCMND30SL41C.tar.bz2]="e484652d06f1383a3543fd9188316a8a"
-CTL_CHECKSUM[RTM0AC0000XVCMNE30SL41C.tar.bz2]="bc419ea899e0d93c226cb637800e8028"
+CTL_CHECKSUM[r8a77951_linux_gsx_binaries_gles.tar.bz2]="997c39ac068d8eb3800b430c3911d7a5"
+CTL_CHECKSUM[r8a77960_linux_gsx_binaries_gles.tar.bz2]="537970d5a7d110169a09698de04bbb76"
+CTL_CHECKSUM[GSX_KM_H3.tar.bz2]="dd331b64c0c46fe3d521d394966c50b2"
+CTL_CHECKSUM[GSX_KM_M3.tar.bz2]="fb4b6fb8d3243bb7d294712ed09b63ee"
+CTL_CHECKSUM[RTM8RC0000ZMX0DQ00JFL3E.tar.bz2]="758c163341efb58d8d00d280d89e97ea"
+CTL_CHECKSUM[RTM8RC0000ZAD1LQ00JPL3E.tar.gz]="524ee69e8825b7c70dcda3730107fcf8"
+CTL_CHECKSUM[RTM8RC0000ZAE1LQ00JPL3E.tar.gz]="088e5eee4ec216481313fb17dd6bccd4"
+CTL_CHECKSUM[RTM8RC0000ZMD0LQ00JPL3E.tar.bz2]="1a6d2386cc64c4f604b2e4f96a328d85"
+CTL_CHECKSUM[RTM8RC0000ZMD1LQ00JPL3E.tar.bz2]="226ed28a7b068c0110db894ab2a8a6e1"
+CTL_CHECKSUM[RTM8RC0000ZME0LQ00JPL3E.tar.bz2]="bfcb34b3d2e11adda20b9584dd4e77ca"
+CTL_CHECKSUM[RTM8RC0000ZME1LQ00JPL3E.tar.bz2]="61fd1ee55d656703dc20317807113c52"
+CTL_CHECKSUM[RTM8RC0000ZMX0LQ00JPL3E.tar.bz2]="8e322ae8be6507022aadbc50f005b389"
+CTL_CHECKSUM[RTM8RC0000ZND1LQ00JPL3E.tar.gz]="ef6a1eec2585ef553d90fd8ca18285f2"
+CTL_CHECKSUM[RTM8RC0000ZNE1LQ00JPL3E.tar.gz]="b88faadc88c134f1e72ec13f07bc84bb"
+CTL_CHECKSUM[RTM8RC0000ZNX0LQ00JPL3E.tar.gz]="03542651835eb7a054925fac691ffb2b"

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt
index a08cc7d..9cc3eb9 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt
@@ -12,7 +12,7 @@ rootmmc=0:2
 booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
 bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
 bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7795-h3ulcb.dtb
+bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77951-ulcb.dtb
 
 bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
 

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
index 979014a..145f82e 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
@@ -12,7 +12,7 @@ rootmmc=0:2
 booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
 bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
 bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7796-m3ulcb.dtb
+bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77960-ulcb.dtb
 
 bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
 

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
index e8ea125..9c7f01b 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/0004-ADSP-enable-and-add-sound-hardware-abstraction.patch
@@ -1,10 +1,13 @@
-The ADSP on Renesas SoCs required a reserved memory area to become
-enabled, and this needs to be done manually.
+From 274657edb779d77ad0fe5ccb52b51634d075adf8 Mon Sep 17 00:00:00 2001
+From: invalid_git config <unknown@unknown>
+Date: Wed, 6 Oct 2021 14:42:47 +0000
+Subject: [PATCH 2/2] The ADSP on Renesas SoCs required a reserved memory area
+ to become enabled, and this needs to be done manually.
 
 This patch adds sound hardware abstraction information for the m3ulcb
 and m3ulcb-kf (kingfisher) device trees. This is helpful on-board the
 ADSP for dynamically determining sound hardware at runtime, allowing
-single binaries to be used between the two boards. 
+single binaries to be used between the two boards.
 
 Future work will incorporate the h3ulcb and Salvator boards into the
 abstraction.
@@ -12,11 +15,15 @@ abstraction.
 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
 Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
 ---
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-index 1cd64c1b3b31..71e59da3528d 100644
---- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-@@ -42,11 +42,18 @@
+ arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts | 45 ++++++++++++++++++-
+ arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 45 ++++++++++++++++++-
+ 2 files changed, 88 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
+index fbc8c9af6e52..df3bd589d9bb 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
++++ b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
+@@ -62,11 +62,18 @@ lossy_decompress: linux,lossy_decompress@54000000 {
                        reg = <0x00000000 0x54000000 0x0 0x03000000>;
                };
  
@@ -36,7 +43,7 @@ index 1cd64c1b3b31..71e59da3528d 100644
                        linux,cma-default;
                };
  
-@@ -110,6 +117,42 @@
+@@ -126,6 +133,42 @@ &du {
                      "dclkin.0", "dclkin.1", "dclkin.2";
  };
  
@@ -79,3 +86,73 @@ index 1cd64c1b3b31..71e59da3528d 100644
  &vspb {
        status = "okay";
  };
+diff --git a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
+index e57dd7bb43f7..f583cc6c18bf 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
++++ b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
+@@ -41,11 +41,18 @@ lossy_decompress: linux,lossy_decompress@54000000 {
+                       reg = <0x00000000 0x54000000 0x0 0x03000000>;
+               };
+ 
++              /* For Audio DSP */
++              adsp_reserved: linux,adsp {
++                      compatible = "shared-dma-pool";
++                      reusable;
++                      reg = <0x00000000 0x57000000 0x0 0x01000000>;
++              };
++
+               /* global autoconfigured region for contiguous allocations */
+               linux,cma@57000000 {
+                       compatible = "shared-dma-pool";
+                       reusable;
+-                      reg = <0x00000000 0x57000000 0x0 0x19000000>;
++                      reg = <0x00000000 0x58000000 0x0 0x18000000>;
+                       linux,cma-default;
+               };
+ 
+@@ -89,6 +96,42 @@ &du {
+                     "dclkin.0", "dclkin.1", "dclkin.2";
+ };
+ 
++&adsp {
++      status = "okay";
++      clock-frequency = <12288000 11289600>;
++      audio-clocks = <22579200 24576000>;
++      memory-region = <&adsp_reserved>;
++
++      /* ADSP playback setting for ak4613 */
++      adsp_playback0: adsp,playback {
++              mode  = "i2s";
++              clock-mode = "master";
++              bus-width = <16>;
++              ssi = <0>;
++              bus-if = <0>;
++              channels = <2>;
++              pin-share-ssi = <1>;
++      };
++
++      /* ADSP capture setting for ak4613 */
++      adsp_capture0: adsp,capture {
++              mode  = "i2s";
++              clock-mode = "slave";
++              bus-width = <16>;
++              ssi = <1>;
++              bus-if = <0>;
++              channels = <2>;
++              pin-share-ssi = <0>;
++      };
++      
++      adsp,ports {
++              port@0 {
++                      playback = <&adsp_playback0>;
++                      capture  = <&adsp_capture0>;
++              };
++      };
++};
++
+ &vspb {
+       status = "okay";
+ };
+-- 
+2.31.1
+

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a7796-m3ulcb-xen.dts b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts
similarity index 98%
rename from meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a7796-m3ulcb-xen.dts
rename to meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts
index 7940b10..6947a62 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a7796-m3ulcb-xen.dts
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts
@@ -7,7 +7,7 @@
  */
 
 /dts-v1/;
-#include "r8a7796.dtsi"
+#include "r8a77960.dtsi"
 #include "ulcb.dtsi"
 
 / {

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
index d4c247b..eccac30 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -13,9 +13,10 @@ AGL_KCONFIG_FRAGMENTS += "namespace_fix.cfg"
 AGL_KCONFIG_FRAGMENTS += " \
     ${@bb.utils.contains('AGL_XEN_WANTED','1','xen-be.cfg','',d)} \
 "
+
 SRC_URI:append:m3ulcb = " \
-    ${@bb.utils.contains('AGL_XEN_WANTED','1','file://r8a7796-m3ulcb-xen.dts;subdir=git/arch/${ARCH}/boot/dts/renesas','',d)} \
+    ${@bb.utils.contains('AGL_XEN_WANTED','1','file://r8a77960-ulcb-xen.dts;subdir=git/arch/${ARCH}/boot/dts/renesas','',d)} \
 "
 KERNEL_DEVICETREE:append:m3ulcb = " \
-    ${@bb.utils.contains('AGL_XEN_WANTED','1','renesas/r8a7796-m3ulcb-xen.dtb','',d)} \
+    ${@bb.utils.contains('AGL_XEN_WANTED','1','renesas/r8a77960-ulcb-xen.dtb','',d)} \
 "

diff --git a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
index 89238e5..e37bae1 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+++ b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston8-20210121.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston8-20210121.zip"
+ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-20210921.zip"
+ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-20210921.zip"
 
 COPY_SCRIPT="$METADIR/bsp/meta-renesas/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
 

diff --git a/meta-netboot/README b/meta-netboot/README
index 7efa226..4918276 100644 (file)
--- a/meta-netboot/README
+++ b/meta-netboot/README
@@ -59,7 +59,7 @@ setenv bootargs_root 'root=/dev/ram0 ramdisk_size=16384 ip=dhcp'
 setenv bootargs_video 'vmalloc=384M video=HDMI-A-1:1920x1080-32@60'
 setenv serverip '<your_serverip>'
 setenv 'bootdaddr' '0x48000000'
-setenv 'bootdfile' 'Image-r8a7795-h3ulcb.dtb'
+setenv 'bootdfile' 'Image-r8a77951-ulcb.dtb'
 setenv 'bootdload_net' 'tftp ${bootdaddr} h3ulcb/${bootdfile}'
 setenv 'bootkaddr' '0x48080000'
 setenv 'bootkfile' 'Image'

diff --git a/templates/machine/ebisu/50_bblayers.conf.inc b/templates/machine/ebisu/50_bblayers.conf.inc
index 16397c2..e06bd41 100644 (file)
--- a/templates/machine/ebisu/50_bblayers.conf.inc
+++ b/templates/machine/ebisu/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "

diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
index 16397c2..e06bd41 100644 (file)
--- a/templates/machine/h3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "

diff --git a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
index 61d472a..25e36b0 100644 (file)
--- a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
@@ -1,4 +1,5 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
   ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "

diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 16397c2..e06bd41 100644 (file)
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "

diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index 16397c2..e06bd41 100644 (file)
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "

diff --git a/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
index 16397c2..e06bd41 100644 (file)
--- a/templates/machine/m3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "

diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 16397c2..e06bd41 100644 (file)
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "

diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index 16397c2..e06bd41 100644 (file)
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+  ${METADIR}/external/poky/meta-yocto-bsp \
   "