diff --git a/hardware/raspberry_pi_3_model_B.nix b/hardware/raspberry_pi_3_model_B.nix
index 8deb5fa..c63aadc 100644
--- a/hardware/raspberry_pi_3_model_B.nix
+++ b/hardware/raspberry_pi_3_model_B.nix
@@ -7,14 +7,18 @@
   boot = {
     initrd = {
       availableKernelModules = [
+        "bcm2835_dma"   # Allows early (earlier) mode setting
+        "i2c_bcm2835"   # Allows early (earlier) mode setting
         "usbhid"
         "usb_storage"
+        "vc4"           # Allows early (earlier) mode setting
       ];
     };
     kernelPackages = pkgs.linuxPackages_latest;   # For a Raspberry Pi 2 or 3)
     kernelParams = [
       "cma=32M"                  # Needed for the virtual console to work on the RPi 3
-      "console=ttyS1,115200n8"   # Enable the serial console
+      "console=ttyS0,115200n8"   # Enable the serial console
+      "console=tty0"
     ];
     loader = {
       generic-extlinux-compatible = {
@@ -41,6 +45,14 @@
       device = "/dev/disk/by-label/NIXOS_SD";
       fsType = "ext4";
     };
+    "/boot/firmware" = {
+      device = "/dev/disk/by-label/FIRMWARE";
+      fsType = "vfat";
+      # Alternatively, this could be removed from the configuration.
+      # The filesystem is not needed at runtime, it could be treated
+      # as an opaque blob instead of a discrete FAT32 filesystem.
+      options = [ "nofail" "noauto" ];
+    };
     "/var" = {
       device = "/dev/disk/by-label/var";
       fsType = "ext4";