From 534be5aeb33760ebf77fd611a493bf959338225c Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sun, 18 Aug 2019 21:43:04 +0200
Subject: [PATCH] add raspberry pi 4 kernel and bootloader to pi3.img target

---
 sys/lib/dist/mkfile     | 9 ++++++---
 sys/src/boot/bcm/mkfile | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys/lib/dist/mkfile b/sys/lib/dist/mkfile
index 3921e425d..98b19ed29 100644
--- a/sys/lib/dist/mkfile
+++ b/sys/lib/dist/mkfile
@@ -53,15 +53,18 @@ cd:V:	/tmp/9front.386.iso.gz
 %.pi3.img:
 	@{
 	objtype=arm64
-	bootcode=/sys/src/boot/bcm/^(bootcode.bin fixup_cd.dat start_cd.elf LICENCE.broadcom)
-	kernel=/n/src9/$objtype/9pi3
+	bootcode=/sys/src/boot/bcm/^(bootcode.bin fixup_cd.dat start_cd.elf fixup4cd.dat start4cd.elf LICENCE.broadcom)
+	kernel=/n/src9/$objtype/^(9pi3 9pi4)
 	> /env/config.txt {
+		echo '[pi4]'
+		echo 'kernel=9pi4'
+		echo 'arm_64bit=1'
 		echo '[pi3]'
 		echo 'kernel=9pi3'
 		echo 'arm_64bit=1'
-		echo 'core_freq=250'
 		echo '[all]'
 		echo 'gpu_mem=16'
+		echo 'core_freq=250'
 		echo 'enable_uart=1'
 		echo 'boot_delay=1'
 	}
diff --git a/sys/src/boot/bcm/mkfile b/sys/src/boot/bcm/mkfile
index 4c8ceef5e..fb329c326 100644
--- a/sys/src/boot/bcm/mkfile
+++ b/sys/src/boot/bcm/mkfile
@@ -1,5 +1,5 @@
 URL=https://github.com/raspberrypi/firmware/raw/master/boot
-FILES=bootcode.bin fixup_cd.dat start_cd.elf LICENCE.broadcom
+FILES=bootcode.bin fixup_cd.dat start_cd.elf fixup4cd.dat start4cd.elf LICENCE.broadcom
 
 all:V:	$FILES