| Message ID | 20200127065946.3446-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | 84f0415201e57e1919a2c91684e64bdedd85d159 |
| Headers | show |
| Series | Consistently use nproc for counting the CPUs | expand |
On Mon, Jan 27, 2020 at 07:59:46AM +0100, Heinrich Schuchardt wrote: > 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 <xypron.glpk at gmx.de> Applied to u-boot/master, thanks!
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}
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 <xypron.glpk at gmx.de> --- 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