From fb6e7813c74e4a978fdc8f7724a56bb593b048f1 Mon Sep 17 00:00:00 2001 From: Haoran Wang Date: Mon, 27 Dec 2021 22:43:58 +0800 Subject: [PATCH 1/4] Add Docker image for NXP imx platform NXP i.MX platform Docker image build supported by this change. Signed-off-by: Haoran Wang --- .github/workflows/docker_img.yaml | 1 + .../docker/images/chip-build-imx/Dockerfile | 22 +++++++++++++++++++ .../docker/images/chip-build-imx/build.sh | 1 + .../docker/images/chip-build-imx/run.sh | 1 + .../docker/images/chip-build-imx/version | 1 + 5 files changed, 26 insertions(+) create mode 100644 integrations/docker/images/chip-build-imx/Dockerfile create mode 120000 integrations/docker/images/chip-build-imx/build.sh create mode 120000 integrations/docker/images/chip-build-imx/run.sh create mode 120000 integrations/docker/images/chip-build-imx/version diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml index ea657a7398eb96..18c15b969b5724 100644 --- a/.github/workflows/docker_img.yaml +++ b/.github/workflows/docker_img.yaml @@ -42,6 +42,7 @@ jobs: - "-esp32" - "-esp32-qemu" - "-infineon" + - "-imx" - "-k32w" - "-mbed-os" - "-nrf-platform" diff --git a/integrations/docker/images/chip-build-imx/Dockerfile b/integrations/docker/images/chip-build-imx/Dockerfile new file mode 100644 index 00000000000000..e6aaf0c9950758 --- /dev/null +++ b/integrations/docker/images/chip-build-imx/Dockerfile @@ -0,0 +1,22 @@ +ARG VERSION=latest +FROM connectedhomeip/chip-build:${VERSION} as build +RUN set -x \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ + wget=1.20.3-1ubuntu2 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/ \ + && : # last line + +WORKDIR /opt +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 \ + && : # last line + +FROM connectedhomeip/chip-build:${VERSION} + +COPY --from=build /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland + +ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.10-hardknott/ diff --git a/integrations/docker/images/chip-build-imx/build.sh b/integrations/docker/images/chip-build-imx/build.sh new file mode 120000 index 00000000000000..fcb4d4ee75d531 --- /dev/null +++ b/integrations/docker/images/chip-build-imx/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-imx/run.sh b/integrations/docker/images/chip-build-imx/run.sh new file mode 120000 index 00000000000000..ccbd3501b330d9 --- /dev/null +++ b/integrations/docker/images/chip-build-imx/run.sh @@ -0,0 +1 @@ +../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-imx/version b/integrations/docker/images/chip-build-imx/version new file mode 120000 index 00000000000000..a4280acd348e7f --- /dev/null +++ b/integrations/docker/images/chip-build-imx/version @@ -0,0 +1 @@ +../chip-build/version \ No newline at end of file From 5efc89009823a18d19ac62c645a1a47d80e5b5ec Mon Sep 17 00:00:00 2001 From: ElvenWang Date: Tue, 4 Jan 2022 15:57:56 +0800 Subject: [PATCH 2/4] Update integrations/docker/images/chip-build-imx/Dockerfile Co-authored-by: Victor Morales --- integrations/docker/images/chip-build-imx/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/integrations/docker/images/chip-build-imx/Dockerfile b/integrations/docker/images/chip-build-imx/Dockerfile index e6aaf0c9950758..f6168d75007712 100644 --- a/integrations/docker/images/chip-build-imx/Dockerfile +++ b/integrations/docker/images/chip-build-imx/Dockerfile @@ -7,7 +7,13 @@ RUN set -x \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line - +RUN set -x \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ + wget=1.20.3-1ubuntu2 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/ \ + && : # last line WORKDIR /opt 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 \ From 6dfa513733bb8200bb20bbb03be607011742d15e Mon Sep 17 00:00:00 2001 From: ElvenWang Date: Tue, 4 Jan 2022 15:59:08 +0800 Subject: [PATCH 3/4] Update Dockerfile Signed-off-by: Haoran.Wang --- integrations/docker/images/chip-build-imx/Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/integrations/docker/images/chip-build-imx/Dockerfile b/integrations/docker/images/chip-build-imx/Dockerfile index f6168d75007712..4250736173a68c 100644 --- a/integrations/docker/images/chip-build-imx/Dockerfile +++ b/integrations/docker/images/chip-build-imx/Dockerfile @@ -1,12 +1,5 @@ ARG VERSION=latest FROM connectedhomeip/chip-build:${VERSION} as build -RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - wget=1.20.3-1ubuntu2 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/ \ - && : # last line RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ From b382ea629187f5975c07edde4656f8c60d638f2d Mon Sep 17 00:00:00 2001 From: ElvenWang Date: Wed, 5 Jan 2022 18:07:57 +0800 Subject: [PATCH 4/4] Add NXP imx Docker image support for vscode image Signed-off-by: Haoran.Wang --- .devcontainer/Dockerfile | 2 ++ integrations/docker/images/chip-build-vscode/Dockerfile | 5 +++++ integrations/docker/images/chip-build/version | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2bed35daf190ea..774da18b982ba1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -72,3 +72,5 @@ RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/ # NXP uses a patch_sdk script to change SDK files RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/ + +RUN chown -R $USERNAME:$USERNAME /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 f6b5fb16b1822f..dd2f4cb360de43 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -10,6 +10,7 @@ FROM connectedhomeip/chip-build-tizen:${VERSION} AS tizen FROM connectedhomeip/chip-build-crosscompile:${VERSION} AS crosscompile FROM connectedhomeip/chip-build-ameba:${VERSION} AS ameba FROM connectedhomeip/chip-build-k32w:${VERSION} AS k32w +FROM connectedhomeip/chip-build-imx:${VERSION} AS imx FROM connectedhomeip/chip-build:${VERSION} # qemu-src copied over because qemu directory contains symlinks to the src @@ -40,6 +41,9 @@ 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 + + # Android license file "acceping" is done by writing license hashes # into the 'licenses' subfolder. This allows any user (in particular # 'vscode' to accept licenses) @@ -67,3 +71,4 @@ ENV TIZEN_HOME /opt/tizen_sdk ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA ENV NXP_K32W061_SDK_ROOT=/opt/sdk/sdks +ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.10-hardknott/ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 12a36d0b09e31b..7228568e02e4b4 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.5.50 Version bump reason: [Ameba] Support Rotating ID for BLE beaconing +0.5.51 Version bump reason: Add Docker image for NXP imx platform