arm-sdk

commit 7fcba028b6f3a5afe338dd26ae83c7fe11aab025
parent ed2a7307502a4be54f910d11972dfe6ec6214e25
Author: parazyd <parazyd@dyne.org>
Date:   Mon, 14 Nov 2016 13:42:22 +0100

Merge branch 'next'

Diffstat:
M
boards/raspberry-pi1.sh
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/boards/raspberry-pi1.sh b/boards/raspberry-pi1.sh
@@ -96,8 +96,9 @@ build_kernel_armel() {
 	prebuild || zerr
 
 	get-kernel-sources
+	export KERNEL=kernel
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		make bcm2709_defconfig
+		make bcmrpi_defconfig
 		make $MAKEOPTS || zerr
 		sudo -E PATH="$PATH" \
 			make INSTALL_MOD_PATH=$strapdir modules_install || zerr
@@ -107,7 +108,7 @@ build_kernel_armel() {
 	sudo cp $CPVERBOSE -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/kernel.img
 	sudo cp $CPVERBOSE arch/arm/boot/dts/bcm*.dtb                $strapdir/boot/
 	sudo cp $CPVERBOSE arch/arm/boot/dts/overlays/*.dtbo $strapdir/boot/overlays/
 	sudo cp $CPVERBOSE arch/arm/boot/dts/overlays/README $strapdir/boot/overlays/
@@ -121,7 +122,7 @@ build_kernel_armel() {
 		sudo -E PATH="$PATH" \
 			make INSTALL_MOD_PATH=$strapdir firmware_install || zerr
 		make mrproper
-		make bcm2709_defconfig
+		make bcmrpi_defconfig
 		sudo -E PATH="$PATH" \
 			make modules_prepare || zerr
 	popd