From 3a27aaea4e1d05bdba266d898ef3e9773be9eba2 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 30 Sep 2016 15:04:55 +0200
Subject: [PATCH] copy to strapdir instead of workdir

---
 boards/raspberry-pi.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/boards/raspberry-pi.sh b/boards/raspberry-pi.sh
index c001e42..f99b1f8 100644
--- a/boards/raspberry-pi.sh
+++ b/boards/raspberry-pi.sh
@@ -93,7 +93,7 @@ EOF
 build_kernel_armhf() {
 	fn build_kernel_armhf
 	req=(R arch device_name gitkernel gitbranch MAKEOPTS rpifirmware)
-	req+=(workdir strapdir)
+	req+=(strapdir)
 	ckreq || return 1
 
 	prebuild || zerr
@@ -131,12 +131,12 @@ build_kernel_armhf() {
 			$R/tmp/kernels/$device_name/${device_name}-firmware
 	fi
 
-	sudo cp -rfv $R/tmp/kernels/$device_name/${device_name}-firmware/boot/* $workdir/boot/
+	sudo cp -rfv $R/tmp/kernels/$device_name/${device_name}-firmware/boot/* $strapdir/boot/
 
 	pushd ${device_name}-linux
-	sudo perl scripts/mkknlimg --dtok arch/arm/boot/zImage $workdir/boot/kernel7.img
-	sudo cp -v arch/arm/boot/dts/bcm*.dtb $workdir/boot
-	sudo cp -v arch/arm/boot/dts/overlays/*overlay*.dtb $workdir/boot/overlays/
+	sudo perl scripts/mkknlimg --dtok arch/arm/boot/zImage $strapdir/boot/kernel7.img
+	sudo cp -v arch/arm/boot/dts/bcm*.dtb $strapdir/boot/
+	sudo cp -v arch/arm/boot/dts/overlays/*overlay*.dtb $strapdir/boot/overlays/
 	popd
 
 	sudo rm -rf $strapdir/lib/firmware
@@ -151,12 +151,12 @@ build_kernel_armhf() {
 	popd
 
 	notice "creating cmdline.txt"
-	cat <<EOF | sudo tee ${workdir}/boot/cmdline.txt
+	cat <<EOF | sudo tee ${strapdir}/boot/cmdline.txt
 dwc_otg.fiq_fix_enable=2 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rootflags=noload net.ifnames=0 quiet
 EOF
 
 	notice "creating config.txt"
-	cat <<EOF | sudo tee ${workdir}/boot/config.txt
+	cat <<EOF | sudo tee ${strapdir}/boot/config.txt
 ## memory shared with the GPU
 gpu_mem=64