xiaomi-tissot: Fix build using new options

(and minor cleanup)
mobile-nixos · May 24, 2020 · e61ac27 · e61ac27
1 parent 5bde131
commit e61ac27
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/devices/xiaomi-tissot/default.nix b/devices/xiaomi-tissot/default.nix
@@ -1,23 +1,17 @@
 { config, lib, pkgs, ... }:
-let
-  inherit (config.mobile.device) name;
-in {
+
+{
   mobile.device.name = "xiaomi-tissot";
   mobile.device.identity = {
     name = "A1";
     manufacturer = "Xiaomi";
   };
 
   mobile.device.info = {
-    flash_offset_base = "0x80000000";
-    flash_offset_kernel = "0x00008000";
-    flash_offset_second = "0x00f00000";
-    flash_offset_ramdisk = "0x01000000";
-    flash_offset_tags = "0x00000100";
-    flash_pagesize = "2048";
+    # TODO : make kernel part of options.
     kernel = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
-    #dtb = "${kernel}/dtbs/msm8953-qrd-sku3-tissot.dtb";
   };
+
   mobile.hardware = {
     soc = "qualcomm-msm8953";
     ram = 1024 * 4;
@@ -26,6 +20,17 @@ in {
     };
   };
 
+  mobile.system.android = {
+    bootimg.flash = {
+      offset_base = "0x80000000";
+      offset_kernel = "0x00008000";
+      offset_second = "0x00f00000";
+      offset_ramdisk = "0x01000000";
+      offset_tags = "0x00000100";
+      pagesize = "2048";
+    };
+  };
+
   boot.kernelParams = [
     "androidboot.hardware=qcom"
     "msm_rtb.filter=0x237"