From 45d1c096236bdd12b1c59c2877d1b59cb4fd5074 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 10 Apr 2017 12:29:41 +0200
Subject: [PATCH] cleanup pi3

---
 boards/raspberry-pi3.sh | 49 +++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/boards/raspberry-pi3.sh b/boards/raspberry-pi3.sh
index c48165b..6bbeef9 100644
--- a/boards/raspberry-pi3.sh
+++ b/boards/raspberry-pi3.sh
@@ -37,10 +37,9 @@ extra_packages+=()
 custmodules=(snd_bcm2835)
 
 gitkernel="https://github.com/raspberrypi/linux"
-gitbranch="rpi-4.9.y"
+gitbranch="rpi-4.10.y"
 rpifirmware="https://github.com/raspberrypi/firmware.git"
 
-makeopts="ARCH=arm64 CROSS_COMPILE=$compiler"
 
 prebuild() {
 	fn prebuild
@@ -78,9 +77,22 @@ build_kernel_arm64() {
 
 	get-kernel-sources || zerr
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		make ${=makeopts} bcm2709_defconfig || zerr
-		make -j$(nproc) ${=makeopts} || zerr
-		sudo -E make ${=makeopts} INSTALL_MOD_PATH=$strapdir modules_install || zerr
+		make \
+			$MAKEOPTS \
+			ARCH=arm64 \
+			CROSS_COMPILE=$compiler \
+				bcm2709_defconfig || zerr
+		make \
+			$MAKEOPTS \
+			ARCH=arm64 \
+			CROSS_COMPILE=$compiler || zerr
+		sudo -E PATH="$PATH" \
+			make \
+				$MAKEOPTS \
+				ARCH=arm64 \
+				CROSS_COMPILE=$compiler \
+				INSTALL_MOD_PATH=$strapdir \
+					modules_install || zerr
 	popd
 
 	clone-git "$rpifirmware" "$R/tmp/kernels/$device_name/${device_name}-firmware"
@@ -94,10 +106,29 @@ build_kernel_arm64() {
 	popd
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		sudo -E make ${=makeopts} INSTALL_MOD_PATH=$strapdir firmware_install || zerr
-		make ${=makeopts} mrproper
-		make ${=makeopts} bcm2709_defconfig
-		sudo -E make ${=makeopts} modules_prepare || zerr
+		sudo -E PATH="$PATH" \
+			make \
+				$MAKEOPTS \
+				ARCH=arm64 \
+				CROSS_COMPILE=$compiler \
+				INSTALL_MOD_PATH=$strapdir \
+					firmware_install || zerr
+		make \
+			$MAKEOPTS \
+			ARCH=arm64 \
+			CROSS_COMPILE=$compiler \
+				mrproper
+		make \
+			$MAKEOPTS \
+			ARCH=arm64 \
+			CROSS_COMPILE=$compiler \
+				bcm2709_defconfig
+		sudo -E PATH="$PATH"\
+			make \
+				$MAKEOPTS \
+				ARCH=arm64 \
+				CROSS_COMPILE=$compiler \
+					modules_prepare || zerr
 	popd
 
 	postbuild || zerr