From a72e7b10532445ec6ddabb3ad424bb108d21e2cb Mon Sep 17 00:00:00 2001
From: Thuy Tran <thuy.tran.xh@rvc.renesas.com>
Date: Mon, 25 Dec 2017 13:53:27 +0700
Subject: rcar-gen3: ADSP: Update ADSP new package names

ADSP new packages have been released.
This commit modifies recipes to add them.

Signed-off-by: Thuy Tran <thuy.tran.xh@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
---
 .../kernel-module-adsp/kernel-module-xtensa-hifi.bb          |  4 ++--
 .../recipes-multimedia/adsp-module/adsp-fw-module.bb         |  4 ++--
 .../recipes-multimedia/adsp-module/adsp-if-module.bb         | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb
index 6d659ed..35fde0f 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb
@@ -11,9 +11,9 @@ inherit module
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/xtensa-hifi:"
 
-SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHPDL4001ZDO.tar.gz', '', d)}"
+SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHPDL4101ZDO.tar.gz', '', d)}"
 
-S = "${WORKDIR}/RCG3AHPDL4001ZDO"
+S = "${WORKDIR}/RCG3AHPDL4101ZDO"
 
 # Define the extra config for using module.bbclass to build ADSP driver
 EXTRA_OEMAKE_append = " KDIR=${STAGING_KERNEL_DIR}"
diff --git a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb
index c57a47a..8849b4c 100644
--- a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb
@@ -3,14 +3,14 @@ LICENSE = "CLOSED"
 
 require include/adsp-control.inc
 
-SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHFWN0101ZDP.tar.gz', '', d )}"
+SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHFWN0201ZDP.tar.gz', '', d )}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/RCG3AHFWN0101ZDP"
+S = "${WORKDIR}/RCG3AHFWN0201ZDP"
 
 do_install() {
     # create the firmware dir
diff --git a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb
index 7128f7d..4983e75 100644
--- a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb
@@ -5,9 +5,9 @@ require include/adsp-control.inc
 
 DEPENDS += "kernel-module-xtensa-hifi"
 
-SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHIFL4001ZDP.tar.gz', '', d )}"
+SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHIFL4101ZDP.tar.gz', '', d )}"
 
-S = "${WORKDIR}/RCG3AHIFL4001ZDP"
+S = "${WORKDIR}/RCG3AHIFL4101ZDP"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -15,7 +15,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 do_configure[noexec] = "1"
 
 # Don't use EXTRA_OEMAKE default value to avoid default CFLAGS, LDFLAGS
-# of poky override the CFLAGS, LDFLAGS inside RCG3AHIFL4001ZDP/Makefile
+# of poky override the CFLAGS, LDFLAGS inside RCG3AHIFL4101ZDP/Makefile
 EXTRA_OEMAKE = "INCSHARED=${STAGING_INCDIR}"
 
 do_compile() {
@@ -31,7 +31,7 @@ do_install() {
     install -d ${D}/${includedir}/os/linux
 
     # Copy library
-    install -m 0755 ${S}/libRCG3AHIFL4001ZDP.so.1.0 ${D}/${libdir}
+    install -m 0755 ${S}/libRCG3AHIFL4101ZDP.so.1.0 ${D}/${libdir}
 
     # Copy shared header files
     install -m 0644 ${S}/include/*.h ${D}/${includedir}
@@ -40,8 +40,8 @@ do_install() {
 
     # Create the symbolic link
     cd ${D}/${libdir}
-    ln -s libRCG3AHIFL4001ZDP.so.1.0 libRCG3AHIFL4001ZDP.so.1
-    ln -s libRCG3AHIFL4001ZDP.so.1 libRCG3AHIFL4001ZDP.so
+    ln -s libRCG3AHIFL4101ZDP.so.1.0 libRCG3AHIFL4101ZDP.so.1
+    ln -s libRCG3AHIFL4101ZDP.so.1 libRCG3AHIFL4101ZDP.so
 }
 
 PACKAGES = " \
-- 
cgit 1.2.3-korg