Re: [PATCH v2 2/5] automation: Add the Dockerfile to build TF-A and U-Boot for FVP
On Fri, 8 Dec 2023, Henry Wang wrote: > Hi Michal, > > > On Dec 8, 2023, at 16:39, Michal Orzel wrote: > > > > Hi Henry, > > > > On 08/12/2023 06:46, Henry Wang wrote: > >> > >> Unlike the emulators that currently being used in the CI pipelines, > >> the FVP must start at EL3. Therefore we need the firmware, i.e. the > >> TrustedFirmware-A (TF-A), for corresponding functionality. > >> > >> There is a dedicated board (vexpress_fvp) in U-Boot (serve as the > >> BL33 of the TF-A) for the FVP platform, so the U-Boot should also be > >> compiled for the FVP platform instead of reusing the U-Boot for the > >> existing emulators used in the CI pipelines. > >> > >> To avoid compiling TF-A and U-Boot everytime in the job, adding a > >> Dockerfile to the test artifacts to build TF-A v2.9.0 and U-Boot > >> v2023.10 for FVP. The binaries for the TF-A and U-Boot, as well as > >> the device tree for the FVP platform, will be saved (and exported by > >> the CI job introduced by following commits). Note that, a patch for > >> the TF-A will be applied before building to enable the virtio-net > >> and the virtio-rng device on the FVP. The virtio-net device will > >> provide the networking service for FVP, and the virtio-rng device > >> will improve the speed of the FVP. > >> > >> Signed-off-by: Henry Wang > >> Reviewed-by: Stefano Stabellini > >> --- > >> v2: > >> - Add Stefano's Reviewed-by tag. > >> --- > >> +# Build U-Boot and TF-A > >> +RUN curl -fsSLO > >> https://ftp.denx.de/pub/u-boot/u-boot-"$UBOOT_VERSION".tar.bz2 && \ > >> +tar xvf u-boot-"$UBOOT_VERSION".tar.bz2 && \ > >> +cd u-boot-"$UBOOT_VERSION" && \ > >> +make -j$(nproc) V=1 vexpress_fvp_defconfig && \ > >> +make -j$(nproc) V=1 all && \ > > Do we need 'all'? Can't we just build target 'u-boot' for u-boot.bin? > > I think your suggestion makes sense, and I can have a try, if changing all to > u-boot works, > I will use that in v3. > > >> +cd .. && \ > >> +git clone --branch "$TFA_VERSION" --depth 1 > >> https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git && \ > >> +cd trusted-firmware-a && \ > >> +curl -fsSLO > >> https://git.yoctoproject.org/meta-arm/plain/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch > >> \ > >> + --output > >> 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch && \ > >> +git config --global user.email "y...@example.com" && \ > >> +git config --global user.name "Your Name" && \ > > If this is needed for git am, you could get away using 'patch -p1' > > Hmmm right, then probably we can even not install git and use the tarball > instead of > git clone. > > > >> +git am > >> 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch && \ > >> +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 > >> FVP_DT_PREFIX=fvp-base-gicv3-psci-1t all && \ > >> +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 > >> FVP_DT_PREFIX=fvp-base-gicv3-psci-1t fip > >> BL33=../u-boot-"$UBOOT_VERSION"/u-boot.bin && \ > >> +cp build/fvp/debug/bl1.bin / && \ > >> +cp build/fvp/debug/fip.bin / && \ > >> +cp build/fvp/debug/fdts/fvp-base-gicv3-psci-1t.dtb / && \ > >> +cd /build && \ > >> +rm -rf u-boot-"$UBOOT_VERSION" trusted-firmware-a > > You forgot to remove u-boot tar file > > oops, nice catch, thanks. Will also remove that in v3. > > > Other than that: > > Reviewed-by: Michal Orzel > > Thanks! > > Stefano: Can I keep your Reviewed-by tag after addressing Michal’s comments > above? Yes Cheers, Stefano
Re: [PATCH v2 2/5] automation: Add the Dockerfile to build TF-A and U-Boot for FVP
Hi Michal, > On Dec 8, 2023, at 16:39, Michal Orzel wrote: > > Hi Henry, > > On 08/12/2023 06:46, Henry Wang wrote: >> >> Unlike the emulators that currently being used in the CI pipelines, >> the FVP must start at EL3. Therefore we need the firmware, i.e. the >> TrustedFirmware-A (TF-A), for corresponding functionality. >> >> There is a dedicated board (vexpress_fvp) in U-Boot (serve as the >> BL33 of the TF-A) for the FVP platform, so the U-Boot should also be >> compiled for the FVP platform instead of reusing the U-Boot for the >> existing emulators used in the CI pipelines. >> >> To avoid compiling TF-A and U-Boot everytime in the job, adding a >> Dockerfile to the test artifacts to build TF-A v2.9.0 and U-Boot >> v2023.10 for FVP. The binaries for the TF-A and U-Boot, as well as >> the device tree for the FVP platform, will be saved (and exported by >> the CI job introduced by following commits). Note that, a patch for >> the TF-A will be applied before building to enable the virtio-net >> and the virtio-rng device on the FVP. The virtio-net device will >> provide the networking service for FVP, and the virtio-rng device >> will improve the speed of the FVP. >> >> Signed-off-by: Henry Wang >> Reviewed-by: Stefano Stabellini >> --- >> v2: >> - Add Stefano's Reviewed-by tag. >> --- >> +# Build U-Boot and TF-A >> +RUN curl -fsSLO >> https://ftp.denx.de/pub/u-boot/u-boot-"$UBOOT_VERSION".tar.bz2 && \ >> +tar xvf u-boot-"$UBOOT_VERSION".tar.bz2 && \ >> +cd u-boot-"$UBOOT_VERSION" && \ >> +make -j$(nproc) V=1 vexpress_fvp_defconfig && \ >> +make -j$(nproc) V=1 all && \ > Do we need 'all'? Can't we just build target 'u-boot' for u-boot.bin? I think your suggestion makes sense, and I can have a try, if changing all to u-boot works, I will use that in v3. >> +cd .. && \ >> +git clone --branch "$TFA_VERSION" --depth 1 >> https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git && \ >> +cd trusted-firmware-a && \ >> +curl -fsSLO >> https://git.yoctoproject.org/meta-arm/plain/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch >> \ >> + --output >> 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch && \ >> +git config --global user.email "y...@example.com" && \ >> +git config --global user.name "Your Name" && \ > If this is needed for git am, you could get away using 'patch -p1' Hmmm right, then probably we can even not install git and use the tarball instead of git clone. >> +git am 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch >> && \ >> +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 >> FVP_DT_PREFIX=fvp-base-gicv3-psci-1t all && \ >> +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 >> FVP_DT_PREFIX=fvp-base-gicv3-psci-1t fip >> BL33=../u-boot-"$UBOOT_VERSION"/u-boot.bin && \ >> +cp build/fvp/debug/bl1.bin / && \ >> +cp build/fvp/debug/fip.bin / && \ >> +cp build/fvp/debug/fdts/fvp-base-gicv3-psci-1t.dtb / && \ >> +cd /build && \ >> +rm -rf u-boot-"$UBOOT_VERSION" trusted-firmware-a > You forgot to remove u-boot tar file oops, nice catch, thanks. Will also remove that in v3. > Other than that: > Reviewed-by: Michal Orzel Thanks! Stefano: Can I keep your Reviewed-by tag after addressing Michal’s comments above? Kind regards, Henry > > ~Michal
Re: [PATCH v2 2/5] automation: Add the Dockerfile to build TF-A and U-Boot for FVP
Hi Henry, On 08/12/2023 06:46, Henry Wang wrote: > > > Unlike the emulators that currently being used in the CI pipelines, > the FVP must start at EL3. Therefore we need the firmware, i.e. the > TrustedFirmware-A (TF-A), for corresponding functionality. > > There is a dedicated board (vexpress_fvp) in U-Boot (serve as the > BL33 of the TF-A) for the FVP platform, so the U-Boot should also be > compiled for the FVP platform instead of reusing the U-Boot for the > existing emulators used in the CI pipelines. > > To avoid compiling TF-A and U-Boot everytime in the job, adding a > Dockerfile to the test artifacts to build TF-A v2.9.0 and U-Boot > v2023.10 for FVP. The binaries for the TF-A and U-Boot, as well as > the device tree for the FVP platform, will be saved (and exported by > the CI job introduced by following commits). Note that, a patch for > the TF-A will be applied before building to enable the virtio-net > and the virtio-rng device on the FVP. The virtio-net device will > provide the networking service for FVP, and the virtio-rng device > will improve the speed of the FVP. > > Signed-off-by: Henry Wang > Reviewed-by: Stefano Stabellini > --- > v2: > - Add Stefano's Reviewed-by tag. > --- > .../2023.10-2.9.0-arm64v8.dockerfile | 48 +++ > 1 file changed, 48 insertions(+) > create mode 100644 > automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile > > diff --git > a/automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile > > b/automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile > new file mode 100644 > index 00..6566b60545 > --- /dev/null > +++ > b/automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile > @@ -0,0 +1,48 @@ > +FROM --platform=linux/arm64/v8 debian:bookworm > +LABEL maintainer.name="The Xen Project" \ > + maintainer.email="xen-devel@lists.xenproject.org" > + > +ENV DEBIAN_FRONTEND=noninteractive > +ENV UBOOT_VERSION="2023.10" > +ENV TFA_VERSION="v2.9.0" > +ENV USER root > + > +RUN mkdir /build > +WORKDIR /build > + > +# build depends > +RUN apt-get update && \ > +apt-get --quiet --yes install \ > +build-essential \ > +libssl-dev \ > +bc \ > +curl \ > +flex \ > +bison \ > +git \ > +device-tree-compiler && \ > +apt-get autoremove -y && \ > +apt-get clean && \ > +rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* > + > +# Build U-Boot and TF-A > +RUN curl -fsSLO > https://ftp.denx.de/pub/u-boot/u-boot-"$UBOOT_VERSION".tar.bz2 && \ > +tar xvf u-boot-"$UBOOT_VERSION".tar.bz2 && \ > +cd u-boot-"$UBOOT_VERSION" && \ > +make -j$(nproc) V=1 vexpress_fvp_defconfig && \ > +make -j$(nproc) V=1 all && \ Do we need 'all'? Can't we just build target 'u-boot' for u-boot.bin? > +cd .. && \ > +git clone --branch "$TFA_VERSION" --depth 1 > https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git && \ > +cd trusted-firmware-a && \ > +curl -fsSLO > https://git.yoctoproject.org/meta-arm/plain/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch > \ > + --output > 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch && \ > +git config --global user.email "y...@example.com" && \ > +git config --global user.name "Your Name" && \ If this is needed for git am, you could get away using 'patch -p1' > +git am 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch > && \ > +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 > FVP_DT_PREFIX=fvp-base-gicv3-psci-1t all && \ > +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 > FVP_DT_PREFIX=fvp-base-gicv3-psci-1t fip > BL33=../u-boot-"$UBOOT_VERSION"/u-boot.bin && \ > +cp build/fvp/debug/bl1.bin / && \ > +cp build/fvp/debug/fip.bin / && \ > +cp build/fvp/debug/fdts/fvp-base-gicv3-psci-1t.dtb / && \ > +cd /build && \ > +rm -rf u-boot-"$UBOOT_VERSION" trusted-firmware-a You forgot to remove u-boot tar file Other than that: Reviewed-by: Michal Orzel ~Michal
[PATCH v2 2/5] automation: Add the Dockerfile to build TF-A and U-Boot for FVP
Unlike the emulators that currently being used in the CI pipelines, the FVP must start at EL3. Therefore we need the firmware, i.e. the TrustedFirmware-A (TF-A), for corresponding functionality. There is a dedicated board (vexpress_fvp) in U-Boot (serve as the BL33 of the TF-A) for the FVP platform, so the U-Boot should also be compiled for the FVP platform instead of reusing the U-Boot for the existing emulators used in the CI pipelines. To avoid compiling TF-A and U-Boot everytime in the job, adding a Dockerfile to the test artifacts to build TF-A v2.9.0 and U-Boot v2023.10 for FVP. The binaries for the TF-A and U-Boot, as well as the device tree for the FVP platform, will be saved (and exported by the CI job introduced by following commits). Note that, a patch for the TF-A will be applied before building to enable the virtio-net and the virtio-rng device on the FVP. The virtio-net device will provide the networking service for FVP, and the virtio-rng device will improve the speed of the FVP. Signed-off-by: Henry Wang Reviewed-by: Stefano Stabellini --- v2: - Add Stefano's Reviewed-by tag. --- .../2023.10-2.9.0-arm64v8.dockerfile | 48 +++ 1 file changed, 48 insertions(+) create mode 100644 automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile diff --git a/automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile b/automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile new file mode 100644 index 00..6566b60545 --- /dev/null +++ b/automation/tests-artifacts/armfvp-uboot-tfa/2023.10-2.9.0-arm64v8.dockerfile @@ -0,0 +1,48 @@ +FROM --platform=linux/arm64/v8 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV UBOOT_VERSION="2023.10" +ENV TFA_VERSION="v2.9.0" +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ +apt-get --quiet --yes install \ +build-essential \ +libssl-dev \ +bc \ +curl \ +flex \ +bison \ +git \ +device-tree-compiler && \ +apt-get autoremove -y && \ +apt-get clean && \ +rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* + +# Build U-Boot and TF-A +RUN curl -fsSLO https://ftp.denx.de/pub/u-boot/u-boot-"$UBOOT_VERSION".tar.bz2 && \ +tar xvf u-boot-"$UBOOT_VERSION".tar.bz2 && \ +cd u-boot-"$UBOOT_VERSION" && \ +make -j$(nproc) V=1 vexpress_fvp_defconfig && \ +make -j$(nproc) V=1 all && \ +cd .. && \ +git clone --branch "$TFA_VERSION" --depth 1 https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git && \ +cd trusted-firmware-a && \ +curl -fsSLO https://git.yoctoproject.org/meta-arm/plain/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch \ + --output 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch && \ +git config --global user.email "y...@example.com" && \ +git config --global user.name "Your Name" && \ +git am 0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch && \ +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 FVP_DT_PREFIX=fvp-base-gicv3-psci-1t all && \ +make -j$(nproc) DEBUG=1 PLAT=fvp ARCH=aarch64 FVP_DT_PREFIX=fvp-base-gicv3-psci-1t fip BL33=../u-boot-"$UBOOT_VERSION"/u-boot.bin && \ +cp build/fvp/debug/bl1.bin / && \ +cp build/fvp/debug/fip.bin / && \ +cp build/fvp/debug/fdts/fvp-base-gicv3-psci-1t.dtb / && \ +cd /build && \ +rm -rf u-boot-"$UBOOT_VERSION" trusted-firmware-a -- 2.25.1
