From a54ec5bacfbcbc30494e866d785d94c60e011c0a Mon Sep 17 00:00:00 2001
From: Faqiang Zhu <71302147+FaqiangZhu-nxp@users.noreply.github.com>
Date: Tue, 28 Jun 2022 22:09:06 +0800
Subject: [PATCH] integrate two more Yocto SDKs into the imx docker image
 (#19941)

Two more Yocto SDKs are installed into the imx docker image.

Change-Id: I9d50d9e24f0ce8b35c9c3e952d49b56ee5770c9d
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
---
 .devcontainer/Dockerfile                                | 2 ++
 integrations/docker/images/chip-build-imx/Dockerfile    | 9 +++++++++
 integrations/docker/images/chip-build-vscode/Dockerfile | 1 +
 integrations/docker/images/chip-build/version           | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3bb78f4ca03294..cf58e3ca156d26 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -75,6 +75,8 @@ RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/
 RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/
 
 RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.10-hardknott/
+RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.15-kirkstone/
+RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-wayland/5.15-kirkstone/
 
 # Add access to openocd for VSCode debugging
 RUN chown -R $USERNAME:$USERNAME /opt/openocd
diff --git a/integrations/docker/images/chip-build-imx/Dockerfile b/integrations/docker/images/chip-build-imx/Dockerfile
index 4250736173a68c..f674576a134bf2 100644
--- a/integrations/docker/images/chip-build-imx/Dockerfile
+++ b/integrations/docker/images/chip-build-imx/Dockerfile
@@ -12,10 +12,19 @@ RUN set -x \
     && wget --quiet -O fsl-l5.10.52-2.1.0-sdk.tar.gz https://www.nxp.com/lgfiles/IMM/fsl-l5.10.52-2.1.0-sdk.tar.gz \
     && tar zxvf fsl-l5.10.52-2.1.0-sdk.tar.gz \
     && ./fsl-imx-xwayland-glibc-x86_64-imx-image-core-cortexa53-crypto-imx8mmevk-toolchain-5.10-hardknott.sh -y \
+    && wget --quiet https://www.nxp.com/lgfiles/IMM/fsl-imx-wayland-glibc-x86_64-imx-image-multimedia-cortexa7t2hf-neon-imx6ullevk-toolchain-5.15-kirkstone.sh \
+    && chmod a+x fsl-imx-wayland-glibc-x86_64-imx-image-multimedia-cortexa7t2hf-neon-imx6ullevk-toolchain-5.15-kirkstone.sh \
+    && ./fsl-imx-wayland-glibc-x86_64-imx-image-multimedia-cortexa7t2hf-neon-imx6ullevk-toolchain-5.15-kirkstone.sh -y \
+    && rm -rf fsl-imx-wayland-glibc-x86_64-imx-image-multimedia-cortexa7t2hf-neon-imx6ullevk-toolchain-5.15-kirkstone.sh \
+    && wget --quiet https://www.nxp.com/lgfiles/IMM/fsl-imx-xwayland-glibc-x86_64-imx-image-multimedia-armv8a-imx8mmevk-toolchain-5.15-kirkstone.sh \
+    && chmod a+x fsl-imx-xwayland-glibc-x86_64-imx-image-multimedia-armv8a-imx8mmevk-toolchain-5.15-kirkstone.sh \
+    && ./fsl-imx-xwayland-glibc-x86_64-imx-image-multimedia-armv8a-imx8mmevk-toolchain-5.15-kirkstone.sh -y \
+    && rm -rf fsl-imx-xwayland-glibc-x86_64-imx-image-multimedia-armv8a-imx8mmevk-toolchain-5.15-kirkstone.sh \
     && : # last line
 
 FROM connectedhomeip/chip-build:${VERSION}
 
 COPY --from=build /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
+COPY --from=build /opt/fsl-imx-wayland /opt/fsl-imx-wayland
 
 ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.10-hardknott/
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index 5bbad09fa8a521..5668b82c984f3e 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -44,6 +44,7 @@ COPY --from=ameba /opt/ameba /opt/ameba
 COPY --from=k32w /opt/sdk/sdks /opt/sdk/sdks
 
 COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
+COPY --from=imx /opt/fsl-imx-wayland /opt/fsl-imx-wayland
 
 COPY --from=ti /opt/ti/sysconfig_1.11.0 /opt/ti/sysconfig_1.11.0
 
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 4229d71169e36b..9e139abc6adc1f 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.5.83 Version bump reason: Infineon P6 software download link update
+0.5.84 Version bump reason: two more Yocto SDKs are to be integrated into the imx docker image