From f6640da88af533dcf049e6c7c6ce8de9c3f76cc5 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 24 Mar 2017 09:42:11 +0100
Subject: [PATCH] update pi1 kernel

---
 boards/raspberry-pi1.sh | 35 ++++++++++++++++-------------------
 boards/raspberry-pi3.sh |  2 +-
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/boards/raspberry-pi1.sh b/boards/raspberry-pi1.sh
index de051d6..db9bc9f 100644
--- a/boards/raspberry-pi1.sh
+++ b/boards/raspberry-pi1.sh
@@ -37,10 +37,10 @@ extra_packages+=()
 custmodules=(snd_bcm2835)
 
 gitkernel="https://github.com/raspberrypi/linux.git"
-gitbranch="rpi-4.4.y"
+gitbranch="rpi-4.9.y"
 rpifirmware="https://github.com/raspberrypi/firmware.git"
 
-make="make ARCH=arm CROSS_COMPILE=$compiler"
+make="ARCH=arm CROSS_COMPILE=$compiler"
 
 prebuild() {
 	fn prebuild
@@ -49,9 +49,7 @@ prebuild() {
 
 	notice "executing $device_name prebuild"
 
-	install-custom-packages
-
-	${=mkdir} -p $R/tmp/kernels/$device_name
+	mkdir -p $R/tmp/kernels/$device_name
 }
 
 postbuild() {
@@ -75,28 +73,27 @@ build_kernel_armel() {
 	prebuild || zerr
 
 	get-kernel-sources || zerr
-	export KERNEL=kernel
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		${=make} bcmrpi_defconfig
-		${=make} $MAKEOPTS || zerr
-		${=sudo} ${=make} INSTALL_MOD_PATH=$strapdir modules_install || zerr
+		make ${=makeopts} bcmrpi_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} perl scripts/mkknlimg --dtok arch/arm/boot/zImage $strapdir/boot/kernel.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/
+		sudo perl scripts/mkknlimg --dtok arch/arm/boot/zImage $strapdir/boot/kernel.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} bcmrpi_defconfig
-		${=sudo} ${=make} modules_prepare || zerr
+		sudo -E make ${=makeopts} INSTALL_MOD_PATH=$strapdir firmware_install || zerr
+		make ${=makeopts} mrproper
+		make ${=makeopts} bcmrpi_defconfig
+		sudo -E make ${=makeopts} modules_prepare || zerr
 	popd
 
 	postbuild || zerr
diff --git a/boards/raspberry-pi3.sh b/boards/raspberry-pi3.sh
index 9001972..c48165b 100644
--- a/boards/raspberry-pi3.sh
+++ b/boards/raspberry-pi3.sh
@@ -87,7 +87,7 @@ build_kernel_arm64() {
 	sudo cp -rf  $R/tmp/kernels/$device_name/${device_name}-firmware/boot/* $strapdir/boot/
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		sudo perl scripts/mkknlimg --dtok arch/arm/boot/zImage $strapdir/boot/kernel7.img
+		sudo perl scripts/mkknlimg --dtok arch/arm/boot/zImage $strapdir/boot/kernel8.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/