diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-30 20:38:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-30 20:38:47 -0500 |
| commit | 514d00e527320a96c682029f4982955700f1664b (patch) | |
| tree | 760a6e20566467356db07f68862f0088be0815b7 /board | |
| parent | e7ab1cb3f0421ad8e8435a8258790e238c623ea2 (diff) | |
| parent | 018921ee79d3f30893614b3b2b63b588d8544f73 (diff) | |
Merge branch '2020-01-30-master-imports'
- Assorted minor fixes
- Revert 6dcb8ba4 from upstream libfdt to restore boot-time speed on
many platforms.
Diffstat (limited to 'board')
| -rw-r--r-- | board/hisilicon/hikey/build-tf.mak | 2 | ||||
| -rw-r--r-- | board/hisilicon/poplar/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/qualcomm/dragonboard820c/MAINTAINERS | 2 |
3 files changed, 3 insertions, 3 deletions
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/board/hisilicon/poplar/MAINTAINERS b/board/hisilicon/poplar/MAINTAINERS index 622e5cb18e..9c045eaeb1 100644 --- a/board/hisilicon/poplar/MAINTAINERS +++ b/board/hisilicon/poplar/MAINTAINERS @@ -1,5 +1,5 @@ Poplar BOARD -M: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> +M: Jorge Ramirez-Ortiz <jorge.ramirez.ortiz@gmail.com> M: Shawn Guo <shawn.guo@linaro.org> S: Maintained F: board/hisilicon/poplar diff --git a/board/qualcomm/dragonboard820c/MAINTAINERS b/board/qualcomm/dragonboard820c/MAINTAINERS index a157033bf0..7ef905bdf6 100644 --- a/board/qualcomm/dragonboard820c/MAINTAINERS +++ b/board/qualcomm/dragonboard820c/MAINTAINERS @@ -1,5 +1,5 @@ DRAGONBOARD820C BOARD -M: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> +M: Jorge Ramirez-Ortiz <jorge.ramirez.ortiz@gmail.com> S: Maintained F: board/qualcomm/dragonboard820c/ F: include/configs/dragonboard820c.h |