Merge branch 'main' into main

Author: jpeel-impinj

Dockerfile.base

@@ -115,7 +115,7 @@ RUN python3 -m pip install -U --no-cache-dir pip && \
 		-r https://raw.githubusercontent.com/zephyrproject-rtos/mcuboot/main/scripts/requirements.txt \
 		GitPython imgtool junitparser junit2html numpy protobuf PyGithub \
 		pylint sh statistics west \
-		nrf-regtool~=7.0.0
+		nrf-regtool~=9.0.1
 # Run pip check on x86 only for now, it fails on arm.
 RUN if [ "${HOSTTYPE}" = "x86_64" ]; then \
 	pip3 check \

Dockerfile.ci

@@ -4,8 +4,7 @@ ARG BASE_IMAGE
 FROM ${BASE_IMAGE:-zephyrprojectrtos/ci-base:latest}
 
 ARG USERNAME=user
-
-ARG ZSDK_VERSION=0.17.0
+ARG ZSDK_VERSION=0.17.1-rc1
 ENV ZSDK_VERSION=$ZSDK_VERSION
 ARG KITWARE_NINJA_VERSION=1.11.1.g95dee.kitware.jobserver-1
 ENV KITWARE_NINJA_VERSION=$KITWARE_NINJA_VERSION
@@ -17,20 +16,24 @@ ARG RENODE_VERSION=1.15.3
 ENV RENODE_VERSION=$RENODE_VERSION
 ARG LLVM_VERSION=16
 ENV LLVM_VERSION=$LLVM_VERSION
-ARG BSIM_VERSION=v2.4
+ARG BSIM_VERSION=v2.5
 ENV BSIM_VERSION=$BSIM_VERSION
 ARG SPARSE_VERSION=9212270048c3bd23f56c20a83d4f89b870b2b26e
 ENV SPARSE_VERSION=$SPARSE_VERSION
 ARG PROTOC_VERSION=21.7
 ENV PROTOC_VERSION=$PROTOC_VERSION
-ARG FVP_BASE_REVC_VERSION=11.24_11
+ARG FVP_BASE_REVC_VERSION=11.27_19
 ENV FVP_BASE_REVC_VERSION=$FVP_BASE_REVC_VERSION
-ARG FVP_BASE_AEMV8R_VERSION=11.24_11
+ARG FVP_BASE_AEMV8R_VERSION=11.27_19
 ENV FVP_BASE_AEMV8R_VERSION=$FVP_BASE_AEMV8R_VERSION
-ARG FVP_CORSTONE300_VERSION=11.24_13
+ARG FVP_CORSTONE300_VERSION=11.27_42
 ENV FVP_CORSTONE300_VERSION=$FVP_CORSTONE300_VERSION
-ARG FVP_CORSTONE310_VERSION=11.24_13
+ARG FVP_CORSTONE310_VERSION=11.27_42
 ENV FVP_CORSTONE310_VERSION=$FVP_CORSTONE310_VERSION
+ARG FVP_CORSTONE315_VERSION=11.27_42
+ENV FVP_CORSTONE315_VERSION=$FVP_CORSTONE315_VERSION
+ARG FVP_CORSTONE320_VERSION=11.27_25
+ENV FVP_CORSTONE320_VERSION=$FVP_CORSTONE320_VERSION
 ARG WGET_ARGS="-q --show-progress --progress=bar:force:noscroll"
 
 # Install Kitware ninja
@@ -86,7 +89,7 @@ RUN mkdir -p /opt/bsim_west && \
 	ln -s /opt/bsim_west/bsim /opt/bsim
 
 # Install cargo environment
-RUN wget -q -O-  "https://sh.rustup.rs" | sh -s -- -y
+RUN wget -q -O-  "https://sh.rustup.rs" | sh -s -- -y --default-toolchain 1.86
 
 # Install uefi-run utility
 RUN ~/.cargo/bin/cargo install uefi-run --root /usr
@@ -137,23 +140,37 @@ RUN mkdir -p /opt/toolchains && \
 # Install FVP
 #
 # Ecosystem FVP License permits redistribution (refer to the relevant license available in the container).
-RUN if [ "${HOSTTYPE}" = "x86_64" ]; then \
+RUN set -o pipefail && \
 	mkdir -p /opt/fvps && \
 	cd /opt/fvps && \
-	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_RevC-2xAEMvA_${FVP_BASE_REVC_VERSION}_Linux64.tgz | tar xz && \
-	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_AEMv8R_${FVP_BASE_AEMV8R_VERSION}_Linux64.tgz | tar xz && \
-	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-300/FVP_Corstone_SSE-300_${FVP_CORSTONE300_VERSION}_Linux64.tgz | tar xz && \
-	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-310/FVP_Corstone_SSE-310_${FVP_CORSTONE310_VERSION}_Linux64.tgz | tar xz && \
-	./FVP_Corstone_SSE-300.sh --no-interactive --i-agree-to-the-contained-eula && \
-	./FVP_Corstone_SSE-310.sh --no-interactive --i-agree-to-the-contained-eula && \
-	ln -s /opt/fvps/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA /usr/local/bin && \
-	ln -s /opt/fvps/AEMv8R_base_pkg/models/Linux64_GCC-9.3/FVP_BaseR_AEMv8R /usr/local/bin && \
-	ln -s /usr/local/FVP_Corstone_SSE-300/models/Linux64_GCC-9.3/FVP_Corstone_SSE-300_Ethos-U55 /usr/local/bin && \
-	ln -s /usr/local/FVP_Corstone_SSE-300/models/Linux64_GCC-9.3/FVP_Corstone_SSE-300_Ethos-U65 /usr/local/bin && \
-	ln -s /usr/local/FVP_Corstone_SSE-310/models/Linux64_GCC-9.3/FVP_Corstone_SSE-310 /usr/local/bin && \
-	ln -s /usr/local/FVP_Corstone_SSE-310/models/Linux64_GCC-9.3/FVP_Corstone_SSE-310_Ethos-U65 /usr/local/bin && \
-	rm FVP_Corstone_SSE-300.sh FVP_Corstone_SSE-310.sh \
-	; fi
+	if [ "${HOSTTYPE}" = "x86_64" ]; then SUFFIX=""; else SUFFIX="_armv8l"; fi && \
+	\
+	declare -A FVP_INSTALLABLE=( \
+	["300"]="${FVP_CORSTONE300_VERSION}" \
+	["310"]="${FVP_CORSTONE310_VERSION}" \
+	["315"]="${FVP_CORSTONE315_VERSION}" \
+	["320"]="${FVP_CORSTONE320_VERSION}" \
+	) ; \
+	for corstone in ${!FVP_INSTALLABLE[@]} ; \
+	do version_build="${FVP_INSTALLABLE[$corstone]}" \
+	&& echo "Downloading Corstone-${corstone} ${version_build}" \
+	&& wget ${WGET_ARGS} -O- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Corstone-IoT/Corstone-${corstone}/FVP_Corstone_SSE-${corstone}_${version_build}_Linux64${SUFFIX}.tgz | tar xz \
+	&& ./FVP_Corstone_SSE-${corstone}.sh --no-interactive --i-agree-to-the-contained-eula -d /opt/fvps/Corstone-${corstone} \
+	&& rm FVP_Corstone_SSE-${corstone}.sh \
+	&& ln -s /opt/fvps/Corstone-${corstone}/models/*/FVP_* /usr/local/bin ; \
+	done && \
+	\
+	declare -A FVP_EXTRACTABLE=( \
+	["RevC-2xAEMvA"]="${FVP_BASE_REVC_VERSION}" \
+	["AEMv8R"]="${FVP_BASE_AEMV8R_VERSION}" \
+	) && \
+	for base in ${!FVP_EXTRACTABLE[@]} ; \
+	do version_build="${FVP_EXTRACTABLE[$base]}" \
+	&& echo "Downloading Base-${base} ${FVP_EXTRACTABLE[$base]}" \
+	&& IFS="_" read version build <<< "${version_build}" \
+	&& wget ${WGET_ARGS} -O- https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-${version}/FVP_Base_${base}_${version_build}_Linux64${SUFFIX}.tgz | tar xz \
+	; done && \
+	ln -s /opt/fvps/*_pkg/models/*/FVP_* /usr/local/bin
 
 # Clean up stale packages
 RUN apt-get clean -y && \

README.md

@@ -63,10 +63,12 @@ docker run -ti -v $HOME/Work/zephyrproject:/workdir \
 
 #### Building Developer Docker Image
 
-The developer docker image can be built using the following command:
+The developer docker image can be built using the following commands:
 
 ```
-docker build -f Dockerfile.devel --build-arg UID=$(id -u) --build-arg GID=$(id -g) -t zephyr-build:v<tag> .
+docker build -f Dockerfile.base --build-arg UID=$(id -u) --build-arg GID=$(id -g) -t zephyr-ci-base:v<tag> .
+docker build -f Dockerfile.ci --build-arg BASE_IMAGE=zephyr-ci-base:v<tag> -t zephyr-ci:v<tag> .
+docker build -f Dockerfile.devel --build-arg BASE_IMAGE=zephyr-ci:v<tag> -t zephyr-build:v<tag> .
 ```
 
 It can be used for building Zephyr samples and tests by mounting the Zephyr workspace into it: