From 746244f9d1b34e66a00dc5d5d4e4fd84c0f6f82e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 24 May 2020 18:39:33 -0400
Subject: [PATCH] pine64-pinephone-braveheart: Fix for new kernel package
 option

---
 devices/pine64-pinephone-braveheart/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/devices/pine64-pinephone-braveheart/default.nix b/devices/pine64-pinephone-braveheart/default.nix
index 14f6fdab..77694429 100644
--- a/devices/pine64-pinephone-braveheart/default.nix
+++ b/devices/pine64-pinephone-braveheart/default.nix
@@ -7,11 +7,6 @@
     manufacturer = "Pine64";
   };
 
-  mobile.device.info = {
-    # TODO : make kernel part of options.
-    kernel = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
-  };
-
   mobile.hardware = {
     soc = "allwinner-a64";
     ram = 1024 * 2;
@@ -20,6 +15,10 @@
     };
   };
 
+  mobile.boot.stage-1 = {
+    kernel.package = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+  };
+
   boot.kernelParams = [
     # Serial console on ttyS0, using the serial headphone adapter.
     "console=ttyS0,115200"