From d012659d022b98b8879f5165cea9282ac5cecd0b Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 24 Mar 2017 09:39:59 +0100
Subject: [PATCH] bump raspi3

---
 boards/raspberry-pi3.sh | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/boards/raspberry-pi3.sh b/boards/raspberry-pi3.sh
index 7cf05ad..9001972 100644
--- a/boards/raspberry-pi3.sh
+++ b/boards/raspberry-pi3.sh
@@ -36,11 +36,11 @@ parted_root="ext4 64 -1"
 extra_packages+=()
 custmodules=(snd_bcm2835)
 
-gitkernel="https://github.com/Electron752/linux.git"
-gitbranch="rpi-4.6.y+rpi364"
+gitkernel="https://github.com/raspberrypi/linux"
+gitbranch="rpi-4.9.y"
 rpifirmware="https://github.com/raspberrypi/firmware.git"
 
-make="make ARCH=arm64 CROSS_COMPILE=$compiler"
+makeopts="ARCH=arm64 CROSS_COMPILE=$compiler"
 
 prebuild() {
 	fn prebuild
@@ -49,10 +49,7 @@ prebuild() {
 
 	notice "executing $device_name prebuild"
 
-	export ARCH=arm64
-	install-custom-packages
-
-	${=mkdir} -p $R/tmp/kernels/$device_name
+	mkdir -p $R/tmp/kernels/$device_name
 }
 
 postbuild() {
@@ -63,8 +60,8 @@ postbuild() {
 	copy-root-overlay
 
 	notice "installing raspberry pi 3 firmware for bt/wifi"
-	${=sudo} ${=mkdir} -p $strapdir/lib/firmware/brcm
-	${=sudo} ${=cp} $R/extra/raspberry-fw/brcmfmac43430-sdio.{bin,txt} $strapdir/lib/firmware/brcm/
+	sudo mkdir -p $strapdir/lib/firmware/brcm
+	sudo cp $R/extra/raspberry-fw/brcmfmac43430-sdio.{bin,txt} $strapdir/lib/firmware/brcm/
 
 	postbuild-clean
 }
@@ -81,26 +78,26 @@ build_kernel_arm64() {
 
 	get-kernel-sources || zerr
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		${=make} bcmrpi3_defconfig || zerr
-		${=make} $MAKEOPTS || zerr
-		${=sudo} ${=make} INSTALL_MOD_PATH=$strapdir modules_install || zerr
+		make ${=makeopts} bcm2709_defconfig || zerr
+		make -j$(nproc) ${=makeopts} || zerr
+		sudo -E make ${=makeopts} INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
-	clone-git $rpifirmware "$R/tmp/kernels/$device_name/${device_name}-firmware"
-	${=sudo} ${=cp} -rf $R/tmp/kernels/$device_name/${device_name}-firmware/boot/* $strapdir/boot/
+	clone-git "$rpifirmware" "$R/tmp/kernels/$device_name/${device_name}-firmware"
+	sudo cp -rf  $R/tmp/kernels/$device_name/${device_name}-firmware/boot/* $strapdir/boot/
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		${=sudo} ${=cp} arch/arm64/boot/Image $strapdir/boot/kernel8.img
-		${=sudo} ${=cp} arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dtb $strapdir/boot/
-		${=sudo} ${=cp} arch/arm64/boot/dts/overlays/*.dtbo $strapdir/boot/overlays/
-		${=sudo} ${=cp} arch/arm64/boot/dts/overlays/README $strapdir/boot/overlays/
+		sudo perl scripts/mkknlimg --dtok arch/arm/boot/zImage $strapdir/boot/kernel7.img
+		sudo cp arch/arm/boot/dts/bcm*.dtb                 $strapdir/boot/
+		sudo cp arch/arm/boot/dts/overlays/*.dtbo          $strapdir/boot/overlays/
+		sudo cp arch/arm/boot/dts/overlays/README          $strapdir/boot/overlays/
 	popd
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		${=sudo} ${=make} INSTALL_MOD_PATH=$strapdir firmware_install || zerr
-		${=make} mrproper
-		${=make} bcmrpi3_defconfig
-		${=sudo} ${=make} modules_prepare || zerr
+		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
 	popd
 
 	postbuild || zerr