diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-10-05 09:14:11 +0200 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-10-08 12:14:59 +0200 |
| commit | b74cfa786197728ddea51a74bc38d1621929ef4a (patch) | |
| tree | c2b6c638d0b2187945363bd176c6a93b1d0bafd1 /.gitlab-ci | |
| parent | 981464356c0bb75ed4b5ee3b8db472d467023bc7 (diff) | |
ci: Update kernel for LAVA
Update to v5.9-rc5-based drm-misc-for-next, so we can run jobs on
machines with Bifrost GPUs.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7011>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/arm64.config | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/container/lava_build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab-ci/arm64.config b/.gitlab-ci/arm64.config index c8d07f2dff7..c9f18f97d0c 100644 --- a/.gitlab-ci/arm64.config +++ b/.gitlab-ci/arm64.config @@ -130,3 +130,7 @@ CONFIG_USB_NET_DRIVERS=y CONFIG_USB_RTL8152=y CONFIG_USB_NET_AX8817X=y CONFIG_USB_NET_SMSC95XX=y + +# For amlogic +CONFIG_MESON_GXL_PHY=y +CONFIG_MDIO_BUS_MUX_MESON_G12A=y diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 5462fedff3d..400f092a5b4 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -21,7 +21,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then GCC_ARCH="aarch64-linux-gnu" KERNEL_ARCH="arm64" DEFCONFIG="arch/arm64/configs/defconfig" - DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb" + DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb" KERNEL_IMAGE_NAME="Image" elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then GCC_ARCH="arm-linux-gnueabihf" diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 221f6f8b366..15d4c6a4f61 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - DISTRIBUTION_TAG: "2020-10-06-clang10-2" + DISTRIBUTION_TAG: "2020-10-08-new-kernel" .kernel+rootfs: stage: container-2 @@ -7,7 +7,7 @@ variables: - .ci-run-policy variables: GIT_STRATEGY: fetch - KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.8-for-mesa-ci/linux-v5.8-for-mesa-ci.tar.gz" + KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.9-rc5-for-mesa-ci/linux-v5.9-rc5-for-mesa-ci.tar.gz" UPLOAD_FOR_LAVA: 1 script: - .gitlab-ci/container/lava_build.sh |