From patchwork Mon Jan 27 06:59:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1229611 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=WKE3mm2r; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 485gc06cM6z9sPJ for ; Mon, 27 Jan 2020 18:00:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2058D814D6; Mon, 27 Jan 2020 07:59:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="WKE3mm2r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6125C815D3; Mon, 27 Jan 2020 07:59:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B20D380929 for ; Mon, 27 Jan 2020 07:59:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1580108390; bh=tA4HNK0pumpKFfws12/GwnkA20Ydd7c+EgrBQj9H/Tg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=WKE3mm2rq2cY6HrdP4vHD/EOr2XB+FHUAwmENJlcm2xKNk9eU7bbKiuy162Kyu4Wf QYn+aQMf+WhT9k4fK5ciuaOA6e3lUwKrqudtYzAATeGTKFkPBpQ8jFLBHxiia9w6u/ QqvEDx0YZD+X0k0J6KG/pY3DjbDCPKblqFkEQ6Rk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([84.119.33.160]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MTRQq-1j1ZSE0giS-00TiEH; Mon, 27 Jan 2020 07:59:50 +0100 From: Heinrich Schuchardt To: Tom Rini Subject: [PATCH] Consistently use nproc for counting the CPUs Date: Mon, 27 Jan 2020 07:59:46 +0100 Message-Id: <20200127065946.3446-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:wUN5fD64YXiWUbP2O0yAVtZmoERk5J4IFF+2sLJ3LOEd486azUZ fguNlpuyLH+gY3VG1w20q49kOLF4SKtmloOLmVwsQ3/XS3FFGO7uwWSLBv128I+Vl7RBro8 uNlwxXnGrQSqiI8wpBqbnDmBw1lqPdstLeK8+KgclpPWpy2kyFfpug67Rq47L87HPMkZU0z 2g7XjsS3xaJgavkNwt0aw== X-UI-Out-Filterresults: notjunk:1; V03:K0:spvY/y3Rc20=:OdZYX1p3Lp2f4Rb55A3j+z 7S4jcLQ2EHJIVB+JtXXPXhdesUO8nUIiiV4aw9ixXwcoAHEQahS5pbbGHNbkWaMfvqZK7aqKD Q3Zi3KmGhJlECAXhNoefSE7UQ8iXJ2vyN6jzTyu7GY7IokNZl3OLxkyR0mAtCtkNrEFRLfmeF GyevRmJEdusRvxRg1AhjYRsu1P7d2DNNwKDknRQNSINUq/Ci/z+68T2I2vZzBl6AChgHq8sB2 hnRENxNnrZgaGotZHGYlWkBJHofhE1ZJl0vpkktnzoVvf3zRxOzg9o5H0dY+lB3VwNas7ml6V DcvPfwhdFfGlc/yVrCx77dormDJ1R8losiWSnmHFBhQZcKk5ig3ONlR4umE/EYvxYi8SG1IMJ raInZKQPZoNhnQbynnumnx9YqdtI4NNoHl17gJCIua1AHGHpGIJr2Fc17eSiwTbBiJw6X2G8X 6iRDeQicWSMZeGK96kvJTdoewXaFScX6Y9MWP8QlsZSRDG4kC7PqqYLFv8N6Yvf8P1SzZvKIY SMjJ5fCTHt4uv/5KhXVYONBhjVg/KZMy4v8C3KIo9J5RgF5Vdjgwbkv2NfeghyF6p5R1VXQAb YsXxIM4cg7lwRyTKATkdhSypKwlFtfmthA9e/uMqcaksruzfyUusMrJ+QKL7rxI9v5CZTMWgb wDEiPTW21uC7qMo2d4lkcLy1nXPcgNTtKzrn29dl9sHns9zPFQ96HqclMf/MHedYTlU2smzs7 y4aXhRKb6mnHfv5iXZgidLRJBfG/0AQ5X6SD/Eo+YNrG1MmLxzMh1yOqcYx4JJTGm2GxOWqF9 D6KH+xFpIyg0rf2Wg8yZWaJk265rtTWThZWWOVX1kchE/HTseTHQOeJM0ZecJVqU1DvXwY1P4 F8wUVWdd/sX5DLqt0Pot0jDCEGZSMwL0Oe3zgNiGihXiOfmzmKLxhCmeWp1YOyBBDpuvL7hOP igNiC8TRpJNliQgxALdO5L8b6FFfPT35G1ljpsY6Z0yIsFe7iq1Sx/jz9+ZX962/1V39ggA86 nBX6bZvtPMSTdKnRHjXhFA/vitWoaMdBMmUNjW5gWDxkFUTCyRla1TQsdkZIDl9YxlNN2MA/L M0Jd5tT1OSIIavXnYh8OrMiWOfCMve1bxF9lcKjtS7wBPLn2tUEos6+jNBSfItA0oV/XLSIdB eh8AcFeaZwkDjdIt/46zQtX4SQap8jA4jZx0pQkhNO2hE2JoH6DVYm5fIj+F3q3TJTg2sB1SR jS/WXlUOrPxR7WD/K X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, Heinrich Schuchardt Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Coreutils command nproc can be used on Linux and BSD to count the number of available CPU cores. Use this instead of relying on the parsing of the Linux specific proc file system. Signed-off-by: Heinrich Schuchardt --- board/hisilicon/hikey/build-tf.mak | 2 +- test/common.sh | 2 +- test/fs/fs-test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.24.1 diff --git a/board/hisilicon/hikey/build-tf.mak b/board/hisilicon/hikey/build-tf.mak index cebb34b61b..cde04827e8 100644 --- a/board/hisilicon/hikey/build-tf.mak +++ b/board/hisilicon/hikey/build-tf.mak @@ -1,6 +1,6 @@ CROSS_COMPILE := aarch64-linux-gnu- output_dir := $(PWD)/../bin -makejobs := $(shell grep '^processor' /proc/cpuinfo | sort -u | wc -l) +makejobs := $(nproc) makethreads := $(shell dc -e "$(makejobs) 1 + p") make_options := GCC49_AARCH64_PREFIX=$CROSS_COMPILE \ -j$(makethreads) -l$(makejobs) diff --git a/test/common.sh b/test/common.sh index 702d1ed051..904d579b7b 100644 --- a/test/common.sh +++ b/test/common.sh @@ -13,7 +13,7 @@ fail() { build_uboot() { echo "Build sandbox" OPTS="O=${OUTPUT_DIR} $1" - NUM_CPUS=$(grep -c processor /proc/cpuinfo) + NUM_CPUS=$(nproc) echo ${OPTS} make ${OPTS} sandbox_config make ${OPTS} -s -j${NUM_CPUS} diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index 721af71d44..b87748106c 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -87,7 +87,7 @@ function check_clean() { # Generate sandbox U-Boot - gleaned from /test/dm/test-dm.sh function compile_sandbox() { unset CROSS_COMPILE - NUM_CPUS=$(cat /proc/cpuinfo |grep -c processor) + NUM_CPUS=$(nproc) make O=sandbox sandbox_config make O=sandbox -s -j${NUM_CPUS}