From nobody Sat May 18 11:26:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626724315606500.05489409829977; Mon, 19 Jul 2021 12:51:55 -0700 (PDT) Received: from localhost ([::1]:46028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5ZIv-0006ZM-Q4 for importer@patchew.org; Mon, 19 Jul 2021 15:51:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5ZHE-0004UE-3J for qemu-devel@nongnu.org; Mon, 19 Jul 2021 15:50:09 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5ZHC-0006cI-9Y for qemu-devel@nongnu.org; Mon, 19 Jul 2021 15:50:07 -0400 Received: by mail-wr1-x42b.google.com with SMTP id l7so23420773wrv.7 for ; Mon, 19 Jul 2021 12:50:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q17sm15159207wrv.47.2021.07.19.12.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 12:50:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1FD9F1FF87; Mon, 19 Jul 2021 20:50:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kbT9YM2qnDiYu1MefImT/Te/Zn63TyXdYA+A8VSke9c=; b=WXCDQa/ZxAxxs+dxnX2BjAqLqe3SMgQ9T7fuIyYGB6hl3Rnxv7M4tbBn/0zBKHlsUM 0tmtd5SDDoDVU3thAd9xV3q6Gga0gO3itr3Wlg/fh3Y+0i6YFbye91GrXQfm9/YEOP5S kNtO2tI4eMPgdU/0ZCv92ggbSFH5b9HSDJsJsdmefCvE57fdltUQDf7tb9Y7yIvhScGF fMvcCa37whQjzX0s3FIgENJowPdOLgcFV3hpyK5rqym5niI5tJYoz4lCGtMjKOtILOH0 tGDjQiFR/qJ1qMM7LB1y+MF+LSFCnRdXgDowLj3wkcXPoO1CJae4xYSPbeYOFOyDk8p4 iw6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kbT9YM2qnDiYu1MefImT/Te/Zn63TyXdYA+A8VSke9c=; b=RwWb9vzuDSJYc11ywtp+T4XrC/REzJRewBaW9Vciv+RSqweTwNi9M65X6uqXPbeFg0 wh90+nIa99VRVhJAzIFb+iV6oFO+arQh9zS3Q/Ozhz/ohcwFL4jbMOomYDrLsBn5pQLB ZWfkXw/eATHMVcNJ1ICg4h/q7nH9/Lw+4vQVUZPc3v6RjZnACUBoNI3eyy3gCirs3ak4 fGt2gPJSgQJIDCSpK0+s7dR0qXNEIzzzmr62V4/btDb9kCcgIs0J8Oaxfse6x1iTwyh4 JVqPe0a9pRDuKbJb4UHspx25OvexEDtY7HflualLa3QHRK9vo5fpyhBX/THZGQwrhSJP fVWA== X-Gm-Message-State: AOAM530FSeCBbjMMqLqdVmF33rksMHUJ/1MeQ1eocn+zUuQwMrK37kH/ zHJVVEsxbecYIK8S+mr5Aaa5yg== X-Google-Smtp-Source: ABdhPJwSwVG4ku6hbkJH5z4DRHxSQobgCED0saJR9YbAAbcUlJej5bCSj3m3c2YMNUVPun0cONsMnA== X-Received: by 2002:adf:db43:: with SMTP id f3mr31996975wrj.143.1626724204397; Mon, 19 Jul 2021 12:50:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/2] hw/tricore: fix inclusion of tricore_testboard Date: Mon, 19 Jul 2021 20:50:01 +0100 Message-Id: <20210719195002.6753-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210719195002.6753-1-alex.bennee@linaro.org> References: <20210719195002.6753-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bastian Koppelmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1626724317311100005 We inadvertently added a symbol clash causing the build not to include the testboard needed for check-tcg. Fixes: f4063f9c31 ("meson: Introduce target-specific Kconfig") Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configs/devices/tricore-softmmu/default.mak | 1 + hw/tricore/Kconfig | 3 +-- hw/tricore/meson.build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/devices/tricore-softmmu/default.mak b/configs/devices/= tricore-softmmu/default.mak index 5cc91cebce..724cb85de7 100644 --- a/configs/devices/tricore-softmmu/default.mak +++ b/configs/devices/tricore-softmmu/default.mak @@ -1 +1,2 @@ +CONFIG_TRITEST=3Dy CONFIG_TRIBOARD=3Dy diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig index 506e6183c1..a1b2438d99 100644 --- a/hw/tricore/Kconfig +++ b/hw/tricore/Kconfig @@ -1,9 +1,8 @@ -config TRICORE +config TRITEST bool =20 config TRIBOARD bool - select TRICORE select TC27X_SOC =20 config TC27X_SOC diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build index 47e36bb077..692a4708ba 100644 --- a/hw/tricore/meson.build +++ b/hw/tricore/meson.build @@ -1,6 +1,6 @@ tricore_ss =3D ss.source_set() -tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c= ')) -tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testdevice.= c')) +tricore_ss.add(when: 'CONFIG_TRITEST', if_true: files('tricore_testboard.c= ')) +tricore_ss.add(when: 'CONFIG_TRITEST', if_true: files('tricore_testdevice.= c')) tricore_ss.add(when: 'CONFIG_TRIBOARD', if_true: files('triboard.c')) tricore_ss.add(when: 'CONFIG_TC27X_SOC', if_true: files('tc27x_soc.c')) =20 --=20 2.32.0.264.g75ae10bc75 From nobody Sat May 18 11:26:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626724316003416.6906682749076; Mon, 19 Jul 2021 12:51:56 -0700 (PDT) Received: from localhost ([::1]:46080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5ZIw-0006bI-T7 for importer@patchew.org; Mon, 19 Jul 2021 15:51:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5ZHG-0004UK-6W for qemu-devel@nongnu.org; Mon, 19 Jul 2021 15:50:11 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:41698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5ZHE-0006e1-Bx for qemu-devel@nongnu.org; Mon, 19 Jul 2021 15:50:09 -0400 Received: by mail-wr1-x431.google.com with SMTP id k4so23418117wrc.8 for ; Mon, 19 Jul 2021 12:50:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a10sm20938479wrm.12.2021.07.19.12.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 12:50:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 38EC61FF8C; Mon, 19 Jul 2021 20:50:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k2M04I6fdSAVcFHWF90gT3uBV37ys7ZO5OsLg838FEk=; b=p+TxOSX4Hl9Yez6xfacbSJpNa1UHbar4/P/XPyEA7OGrJasUT2DIoBATW2WJVvb4v9 D0eP8E3HW5mzS8V915wtFRZUR5n6AreyDMSmk/zdJkAk3srmNQekXGEfCtsqu6bT4/5j IKTWWZ2zxS9311i8sWG0+sLuC2LUHw7tPmzeIvCVdKaqDdP9rorCYcDg1sqCxh1WfCch bOpmJsWBmWnuoa6kp2PKKRow4g0u2i3dhzz2JQ1CI727RHMYUWL0Zq5IB/2P7vc8ULTZ XNJgeejsIGGP6/aSZzDvVY1eYPNGuR7X5kfn+D9kkmHdQg+13HDhub9HD32udiqKyfXq nEWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k2M04I6fdSAVcFHWF90gT3uBV37ys7ZO5OsLg838FEk=; b=K8eA7JQjPq/nCgH0SY6qDBx5qz1v2n2RhKkqiWzozbQFFNeWjKVST9PdMve84/5eel Gi2ghbhnxZTROj0t9hr3JldRP5SCzYPS9qCVih8Dem6Tyn+P+rOFelMs7PNK2zjtARHH fLJF+4EfRpBm1EI59qEsfxBuTRExZw1qPMMN+dIKkD6wiVEpxmIvCWQ05dD0f2mbX7JB TfR9jk+UGXkwoz8onyx4gHhaE5gJCW5NLRCQgu7FhfUjhNnKqyn4fikOBZXOqO5gIGWO 3dwx8nLbLMc5BXeaxGOditNha63G9xi/Log7FErMorU+U+qOdOZHGTEaJ6eZy1lcHPTb jL5Q== X-Gm-Message-State: AOAM532PtD8ZHM0fqbfWvFQv94TnVLNKM+5JqGxb5XC/kMnr/X4FKKtn 7BpFomOkcgBV1+EgB/APbnstMA== X-Google-Smtp-Source: ABdhPJwSFeQ0cid+rMtFQz+ar9bdoy7UBeqZl+1xSxt4D4tnOIouSI/KXXGBHjJ9OQX6lkGeKVi47g== X-Received: by 2002:a5d:4e0d:: with SMTP id p13mr31608708wrt.372.1626724207058; Mon, 19 Jul 2021 12:50:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/2] gitlab: enable a very minimal build with the tricore container Date: Mon, 19 Jul 2021 20:50:02 +0100 Message-Id: <20210719195002.6753-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210719195002.6753-1-alex.bennee@linaro.org> References: <20210719195002.6753-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1626724317111100002 We do the same thing as hexagon and do a two stage build that provides the minimal dependencies to build qemu-tricore-system and it's check-tcg tests. Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/buildtest.yml | 11 +++++ .../dockerfiles/debian-tricore-cross.docker | 48 +++++++++++++++++-- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 89df51517c..1f3fbcd965 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -354,6 +354,17 @@ build-some-softmmu: TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu MAKE_CHECK_ARGS: check-tcg =20 +# We build tricore in a very minimal tricore only container +build-tricore-softmmu: + extends: .native_build_job_template + needs: + job: debian-tricore-cross-container + variables: + IMAGE: debian-tricore-cross + CONFIGURE_ARGS: --disable-tools --enable-debug + TARGETS: tricore-softmmu + MAKE_CHECK_ARGS: check-tcg + clang-system: extends: .native_build_job_template needs: diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index 985925134c..50c87f251f 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -15,9 +15,47 @@ RUN git clone --single-branch \ https://github.com/bkoppelmann/tricore-binutils.git \ /usr/src/binutils && \ cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=3D-w ./configure --prefix=3D/usr --disable-nls --target=3Dtrico= re && \ - make && make install && \ - rm -rf /usr/src/binutils + CFLAGS=3D-w ./configure --prefix=3D/usr/local --disable-nls --target= =3Dtricore && \ + make && make install =20 -# This image isn't designed for building QEMU but building tests -ENV QEMU_CONFIGURE_OPTS --disable-system --disable-user +FROM debian:buster-slim +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list +# Install QEMU build deps for use in CI +RUN apt update && \ + DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=3Dnoninteractive eatmydata apt install -yy \ + build-essential \ + git \ + libglib2.0-dev \ + libpixman-1-dev \ + ninja-build \ + python3 \ + pkg-config + bzip2 \ + ca-certificates \ + ccache \ + diffutils \ + findutils \ + g++ \ + gcc \ + git \ + libcapstone-dev \ + libfdt-dev \ + libglib2.0-dev \ + libpixman-1-dev \ + libtest-harness-perl \ + locales \ + make \ + ninja-build \ + perl-base \ + pkgconf \ + python3-pip \ + python3-setuptools \ + python3-wheel +COPY --from=3D0 /usr/local /usr/local +ENV PATH $PATH:/usr/local/bin/ + +# This image can only build a very minimal QEMU as well as the tests +ENV DEF_TARGET_LIST tricore-softmmu +ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --=20 2.32.0.264.g75ae10bc75