From patchwork Tue Jun 21 12:29:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Kardach X-Patchwork-Id: 113177 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C3374A00C5; Tue, 21 Jun 2022 14:29:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B45A441132; Tue, 21 Jun 2022 14:29:32 +0200 (CEST) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by mails.dpdk.org (Postfix) with ESMTP id 2E78640151 for ; Tue, 21 Jun 2022 14:29:32 +0200 (CEST) Received: by mail-lj1-f175.google.com with SMTP id o23so8117148ljg.13 for ; Tue, 21 Jun 2022 05:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+0lsekrBZQ4ebB7cewvg1vDvINsVLgh9P4xA4alRwEY=; b=EL5EP7xxXp1k5aWPnlVKinQfKGjCT8iYOtm15NaOkAEfclcld0SnbLqduf6/MLKT3t SDIuDySrV4fRKnJIfeIilz10JAuIKX0kAUmiYS5dexxru96OOHbsc8d788PtmEDeerjx bKXEaAhSBLOih+l3hsSMhE9NOl8kNgBRNQl0jsnKYSEwLLtkVSYr+Iojz1+l2Y/4iH28 m+GVGdh+YBp3/s0l1lciEpBFFRHJp3xk2YdDgUj9Z+4Fpt8eNlyomCZkFbe5kMx0l913 0779KFKsjVEMV92q0CUd817nOuvALOx5sPf6fm6YM82iVQ53qF2FQ15f2KkRa93NYkhK e8cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+0lsekrBZQ4ebB7cewvg1vDvINsVLgh9P4xA4alRwEY=; b=rGPVfRQUaRIsKuJBwIQuJ2uiv2hNNout36DsaTt30lqbh6qN9SMoQ8K2Zo2ixmHJQM cj7KZnjbP0oTjN+wAy6PF/GafY36OUgy/6KV47ohMelDBReJYCAFta29lyurW58G0zJv xxoafyc4T/XAQvLOfN8sXoHwk14ZIKQRs2Gus4pyHQWEuk+ZdlGSn7E3+TnhpHRL+/mi yPvD2PlRKK4MY6DzH1raLw6/Bf/yARqWsMCqznzCiMWAN0V8pYkpwk2KQM725eWYegEJ HmgYvdBmEqjmcTNtUcyzsBlqOtpYfax33xiFIgM/xRcxe28XxsM39DaHa7b9dmpCYz06 cBAg== X-Gm-Message-State: AJIora8S8JyeKnk9l0IOvA9qJSZnhvcXEh1pXsg91kRFJA2EPfTDKul/ UIDuU72dRcGWjEs0uUlz12YhfQ== X-Google-Smtp-Source: AGRyM1u2IQdClTgoTrwZ/N8/+U1tejgyl/uyjJ/OM7mRZwp7H1BlpnJ8tnElOCxEvvODGoRv7M+hUw== X-Received: by 2002:a05:651c:2102:b0:25a:42ee:49ae with SMTP id a2-20020a05651c210200b0025a42ee49aemr14003284ljq.200.1655814571809; Tue, 21 Jun 2022 05:29:31 -0700 (PDT) Received: from toster.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id 8-20020a05651c00c800b002555dd9c20fsm2025768ljr.20.2022.06.21.05.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 05:29:31 -0700 (PDT) From: Stanislaw Kardach To: David Marchand Cc: Stanislaw Kardach , dev@dpdk.org, upstream@semihalf.com Subject: [PATCH] config/riscv: name the cross file properly Date: Tue, 21 Jun 2022 14:29:23 +0200 Message-Id: <20220621122923.188425-1-kda@semihalf.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Since the riscv64_linux_gcc was in fact a Ubuntu-specific cross-file, rename it. Signed-off-by: Stanislaw Kardach --- .ci/linux-build.sh | 2 +- config/riscv/{riscv64_linux_gcc => riscv64_linux_gcc_ubuntu} | 0 devtools/test-meson-builds.sh | 2 +- doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename config/riscv/{riscv64_linux_gcc => riscv64_linux_gcc_ubuntu} (100%) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 06104eca22..dcf4d4ccb3 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -75,7 +75,7 @@ if [ "$PPC64LE" = "true" ]; then fi if [ "$RISCV64" = "true" ]; then - cross_file=config/riscv/riscv64_linux_gcc + cross_file=config/riscv/riscv64_linux_gcc_ubuntu fi if [ -n "$cross_file" ]; then diff --git a/config/riscv/riscv64_linux_gcc b/config/riscv/riscv64_linux_gcc_ubuntu similarity index 100% rename from config/riscv/riscv64_linux_gcc rename to config/riscv/riscv64_linux_gcc_ubuntu diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 04a85fe987..00b97a3e50 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -265,7 +265,7 @@ f=$srcdir/config/ppc/ppc64le-power8-linux-gcc build build-ppc64-power8-gcc $f ABI $use_shared # generic RISC-V -f=$srcdir/config/riscv/riscv64_linux_gcc +f=$srcdir/config/riscv/riscv64_linux_gcc_ubuntu build build-riscv64-generic-gcc $f ABI $use_shared # Test installation of the x86-generic target, to be used for checking diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst index 9e121645a8..84d1ea3aa6 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst @@ -74,7 +74,7 @@ To cross-compile DPDK for a desired target machine use the following command:: For example if the target machine is a generic rv64gc RISC-V, use the following command:: - meson riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc + meson riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc_ubuntu ninja -C riscv64-build-gcc If riscv-gnu-toolchain is used, binary names should be updated to match. Update @@ -106,7 +106,7 @@ Supported cross-compilation targets Currently the following targets are supported: -* Generic rv64gc ISA: ``config/riscv/riscv64_linux_gcc`` +* Generic rv64gc ISA: ``config/riscv/riscv64_linux_gcc_ubuntu`` * SiFive U740 SoC: ``config/riscv/riscv64_sifive_u740_linux_gcc``