From 1a4d5a90dca0f0f0c689cf112f94ec8dbf21e705 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 24 May 2020 18:39:21 -0400
Subject: [PATCH] motorola-addison: Fix for new kernel package option

---
 devices/motorola-addison/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/devices/motorola-addison/default.nix b/devices/motorola-addison/default.nix
index 5ef42220..332b434f 100644
--- a/devices/motorola-addison/default.nix
+++ b/devices/motorola-addison/default.nix
@@ -7,11 +7,6 @@
     manufacturer = "Motorola";
   };
 
-  mobile.device.info = {
-    # TODO : make kernel part of options.
-    kernel = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
-  };
-
   mobile.hardware = {
     soc = "qualcomm-msm8953";
     ram = 1024 * 3;
@@ -20,8 +15,12 @@
     };
   };
 
+  mobile.boot.stage-1 = {
+    kernel.package = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+  };
+
   mobile.system.android.bootimg = {
-    dt = "${config.mobile.device.info.kernel}/dtbs/motorola-addison.img";
+    dt = "${config.mobile.boot.stage-1.kernel.package}/dtbs/motorola-addison.img";
     flash = {
       offset_base = "0x80000000";
       offset_kernel = "0x00008000";