From db480cf0e1fb46f33a900f64841fa1d8c9128d88 Mon Sep 17 00:00:00 2001 From: Travis Staton Date: Mon, 13 Feb 2023 08:33:47 -0500 Subject: [PATCH] enable krnbt by default use generic arm64 uboot for rpi4 --- sd-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sd-image/default.nix b/sd-image/default.nix index 5450687..4d11f26 100644 --- a/sd-image/default.nix +++ b/sd-image/default.nix @@ -22,7 +22,7 @@ kernel=u-boot-rpi_arm64.bin [pi4] - kernel=u-boot-rpi4.bin + kernel=u-boot-rpi_arm64.bin enable_gic=1 armstub=armstub8-gic.bin arm_boost=1 @@ -34,6 +34,7 @@ [all] # Boot in 64-bit mode. arm_64bit=1 + dtparam=krnbt=on # U-Boot needs this to work, regardless of whether UART is actually used or not. # Look in arch/arm/mach-bcm283x/Kconfig in the U-Boot tree to see if this is still @@ -57,7 +58,6 @@ cp ${raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-3-b-plus.dtb firmware/ # Add pi4 specific files - cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin cp ${raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/