Skip to content

Commit a55cf43

Browse files
jmartinez-silabsaustina-csa
authored andcommitted
Update silabs Docker image for new SDKs release (project-chip#34002)
1 parent aaca567 commit a55cf43

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
55 : Update to Ubuntu 24.04 as the base build image
1+
56 : Update Silabs docker SiSDK 2024.06.0 WiseConnect 3.3.0

integrations/docker/images/stage-2/chip-build-efr32/Dockerfile

+13-12
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ RUN set -x \
1313
&& : # last line
1414

1515

16-
# Clone Gecko SDK 4.4.2 (e359ba4)
17-
RUN wget https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.2/gecko-sdk.zip -O /tmp/gecko_sdk.zip \
18-
&& unzip /tmp/gecko_sdk.zip -d /tmp/gecko_sdk \
19-
&& rm -rf /tmp/gecko_sdk.zip \
16+
# Download Simplicity SDK v2024.6.0 (a1a37fa)
17+
RUN wget https://github.com/SiliconLabs/simplicity_sdk/releases/download/v2024.6.0/sisdk-sdk.zip -O /tmp/simplicity_sdk.zip \
18+
&& unzip /tmp/simplicity_sdk.zip -d /tmp/simplicity_sdk \
19+
&& rm -rf /tmp/simplicity_sdk.zip \
2020
# Deleting files that are not needed to save space
21-
&& rm -rf /tmp/gecko_sdk/protocol/flex /tmp/gecko_sdk/protocol/z-wave /tmp/gecko_sdk/protocol/zigbee /tmp/gecko_sdk/protocol/wisun \
22-
&& find /tmp/gecko_sdk/protocol/bluetooth /tmp/gecko_sdk/platform -name "*.a" -type f -delete \
23-
&& find /tmp/gecko_sdk/protocol/openthread -name "*efr32mg21*" -delete \
24-
&& find /tmp/gecko_sdk/protocol/openthread -name "*efr32mg13*" -delete \
21+
&& rm -rf /tmp/simplicity_sdk/protocol/flex /tmp/simplicity_sdk/protocol/z-wave /tmp/simplicity_sdk/protocol/zigbee /tmp/simplicity_sdk/protocol/wisun \
22+
&& find /tmp/simplicity_sdk/protocol/bluetooth /tmp/simplicity_sdk/platform -name "*.a" -type f -delete \
23+
&& find /tmp/simplicity_sdk/protocol/openthread -name "*efr32mg21*" -delete \
2524
&& : # last line
2625

2726
# Clone WiSeConnect Wi-Fi and Bluetooth Software 2.8.2 (4fa5c5f)
@@ -30,8 +29,8 @@ RUN git clone --depth=1 --single-branch --branch=2.8.2 https://github.com/Silico
3029
rm -rf .git \
3130
&& : # last line
3231

33-
# Clone WiSeConnect SDK 3.1.3-matter-hotfix.4 (aa514d4)
34-
RUN git clone --depth=1 --single-branch --branch=v3.1.3-matter-hotfix.4 https://github.com/SiliconLabs/wiseconnect.git /tmp/wifi_sdk && \
32+
# Clone WiSeConnect SDK v3.3.0 (e97a0ed)
33+
RUN git clone --depth=1 --single-branch --branch=v3.3.0 https://github.com/SiliconLabs/wiseconnect.git /tmp/wifi_sdk && \
3534
cd /tmp/wifi_sdk && \
3635
rm -rf .git \
3736
&& : # last line
@@ -63,12 +62,14 @@ RUN set -x \
6362
&& rm /tmp/requirements.txt \
6463
&& : # last line
6564

66-
ENV GSDK_ROOT=/opt/silabs/gecko_sdk/
65+
# Keep GSDK_ROOT name until rename transition to SISDK is completed
66+
ENV GSDK_ROOT=/opt/silabs/simplicity_sdk/
67+
ENV SISDK_ROOT=/opt/silabs/simplicity_sdk/
6768
ENV WISECONNECT_SDK_ROOT=/opt/silabs/wiseconnect-wifi-bt-sdk/
6869
ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk/
6970
ENV PATH="${PATH}:/opt/silabs/slc_cli/"
7071

71-
COPY --from=build /tmp/gecko_sdk /opt/silabs/gecko_sdk
72+
COPY --from=build /tmp/simplicity_sdk /opt/silabs/simplicity_sdk
7273
COPY --from=build /tmp/wiseconnect-wifi-bt-sdk/ /opt/silabs/wiseconnect-wifi-bt-sdk/
7374
COPY --from=build /tmp/wifi_sdk /opt/silabs/wifi_sdk
7475
COPY --from=build /tmp/slc_cli /opt/silabs/slc_cli

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ COPY --from=bouffalolab /opt/bouffalolab_sdk /opt/bouffalolab_sdk
6060

6161
COPY --from=asr /opt/asr /opt/asr
6262

63-
COPY --from=efr32 /opt/silabs/gecko_sdk /opt/silabs/gecko_sdk
63+
COPY --from=efr32 /opt/silabs/simplicity_sdk /opt/silabs/simplicity_sdk
6464
COPY --from=efr32 /opt/silabs/wiseconnect-wifi-bt-sdk /opt/silabs/wiseconnect-wifi-bt-sdk
6565
COPY --from=efr32 /opt/silabs/wifi_sdk /opt/silabs/wifi_sdk
6666

@@ -113,8 +113,10 @@ ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
113113
ENV ANDROID_HOME=/opt/android/sdk
114114
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
115115
ENV CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.4"
116-
ENV SILABS_BOARD=BRD4161A
117-
ENV GSDK_ROOT=/opt/silabs/gecko_sdk/
116+
ENV SILABS_BOARD=BRD4186C
117+
# Keep GSDK_ROOT name until rename transition to SISDK is completed
118+
ENV GSDK_ROOT=/opt/silabs/simplicity_sdk/
119+
ENV SISDK_ROOT=/opt/silabs/simplicity_sdk/
118120
ENV WISECONNECT_SDK_ROOT=/opt/silabs/wiseconnect-wifi-bt-sdk/
119121
ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk
120122
ENV IDF_PATH=/opt/espressif/esp-idf/

0 commit comments

Comments
 (0)