From 77eef6f139d559d4c8ced99e7daf23d75ae98deb Mon Sep 17 00:00:00 2001
From: dinabenamar <108664279+dinabenamar@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:53:10 +0100
Subject: [PATCH] [Docker][NXP] Adding RW61x SDK support (#30706)

---
 .../docker/images/base/chip-build/version     |  2 +-
 .../stage-2/chip-build-rw61x/Dockerfile       | 26 +++++++++++++++++++
 .../images/stage-2/chip-build-rw61x/build.sh  |  1 +
 .../images/stage-2/chip-build-rw61x/run.sh    |  1 +
 .../images/stage-2/chip-build-rw61x/version   |  1 +
 .../vscode/chip-build-vscode/Dockerfile       |  4 +++
 6 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 integrations/docker/images/stage-2/chip-build-rw61x/Dockerfile
 create mode 120000 integrations/docker/images/stage-2/chip-build-rw61x/build.sh
 create mode 120000 integrations/docker/images/stage-2/chip-build-rw61x/run.sh
 create mode 120000 integrations/docker/images/stage-2/chip-build-rw61x/version

diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
index f869e03779cc1f..dc78b3d46f7ef2 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-27 : [NXP] Update K32W0 Docker image
+28 : [NXP] Add support for RW61x SDK
diff --git a/integrations/docker/images/stage-2/chip-build-rw61x/Dockerfile b/integrations/docker/images/stage-2/chip-build-rw61x/Dockerfile
new file mode 100644
index 00000000000000..02053b183b402c
--- /dev/null
+++ b/integrations/docker/images/stage-2/chip-build-rw61x/Dockerfile
@@ -0,0 +1,26 @@
+ARG VERSION=1
+FROM ghcr.io/project-chip/chip-build:${VERSION} as build
+LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
+
+RUN set -x \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
+    wget unzip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/ \
+    && : # last line
+
+WORKDIR /opt/sdk
+# Setup RW61x SDK
+RUN set -x \
+    && mkdir -p rw61x \
+    && wget https://www.nxp.com/lgfiles/bsps/SDK_2_13_2_RD-RW612-BGA.zip \
+    && unzip SDK_2_13_2_RD-RW612-BGA.zip -d rw61x \
+    && rm -rf SDK_2_13_2_RD-RW612-BGA.zip \
+    && : # last line
+
+FROM ghcr.io/project-chip/chip-build:${VERSION}
+
+COPY --from=build /opt/sdk/ /opt/sdk/
+
+ENV NXP_SDK_ROOT=/opt/sdk/rw61x
diff --git a/integrations/docker/images/stage-2/chip-build-rw61x/build.sh b/integrations/docker/images/stage-2/chip-build-rw61x/build.sh
new file mode 120000
index 00000000000000..46b20313461454
--- /dev/null
+++ b/integrations/docker/images/stage-2/chip-build-rw61x/build.sh
@@ -0,0 +1 @@
+../../../build.sh
\ No newline at end of file
diff --git a/integrations/docker/images/stage-2/chip-build-rw61x/run.sh b/integrations/docker/images/stage-2/chip-build-rw61x/run.sh
new file mode 120000
index 00000000000000..9bbfad86d46e50
--- /dev/null
+++ b/integrations/docker/images/stage-2/chip-build-rw61x/run.sh
@@ -0,0 +1 @@
+../../../run.sh
\ No newline at end of file
diff --git a/integrations/docker/images/stage-2/chip-build-rw61x/version b/integrations/docker/images/stage-2/chip-build-rw61x/version
new file mode 120000
index 00000000000000..a40ba48b0188a8
--- /dev/null
+++ b/integrations/docker/images/stage-2/chip-build-rw61x/version
@@ -0,0 +1 @@
+../../base/chip-build/version
\ No newline at end of file
diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
index 8ca2f980f0cf6f..91e9a9b5036158 100644
--- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
@@ -11,6 +11,7 @@ FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} AS tizen
 FROM ghcr.io/project-chip/chip-build-crosscompile:${VERSION} AS crosscompile
 FROM ghcr.io/project-chip/chip-build-ameba:${VERSION} AS ameba
 FROM ghcr.io/project-chip/chip-build-k32w:${VERSION} AS k32w
+FROM ghcr.io/project-chip/chip-build-rw61x:${VERSION} AS rw61x
 FROM ghcr.io/project-chip/chip-build-imx:${VERSION} AS imx
 FROM ghcr.io/project-chip/chip-build-ti:${VERSION} AS ti
 FROM ghcr.io/project-chip/chip-build-openiotsdk:${VERSION} AS openiotsdk
@@ -50,6 +51,8 @@ COPY --from=ameba /opt/ameba /opt/ameba
 
 COPY --from=k32w /opt/sdk /opt/k32w
 
+COPY --from=rw61x /opt/sdk /opt/nxp-sdk
+
 COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
 
 COPY --from=ti /opt/ti/sysconfig_1.16.2 /opt/ti/sysconfig_1.16.2
@@ -113,6 +116,7 @@ ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
 ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
 ENV NXP_K32W0_SDK_ROOT=/opt/k32w/core
 ENV NXP_K32W1_SDK_ROOT=/opt/k32w/k32w1
+ENV NXP_SDK_ROOT=/opt/nxp-sdk/rw61x
 ENV OPENOCD_PATH=/opt/openocd/
 ENV PW_ENVIRONMENT_ROOT=/home/vscode/pigweed/env
 ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa