Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0c2595071968
Choose a base ref
...
head repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 816faa019809
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Nov 7, 2019

  1. Remove postmarketOS-devices.json 

    Anchoring ourselves to an external project, at this point, is not
feasible. This does not allow us to explore making better use of the
capabilities of nix.

Though, a mechanism using third-party resources, like the postmarketOS
device information, is something that is desirable. The difference is
that it would need to *import* the information in the format used by
mobile-nixos, rather than mobile-nixos importing the information from a
"data dump".
    @samueldr
    samueldr committed Nov 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    19d3e79 View commit details

  2. qemu-x86_64: import data from postmarketOS-devices.json

    @samueldr
    samueldr committed Nov 7, 2019
    Copy the full SHA
    8a41ff8 View commit details

  3. asus-z00t: import data from postmarketOS-devices.json

    @samueldr
    samueldr committed Nov 7, 2019
    Copy the full SHA
    3ad5496 View commit details

  4. asus-flo: import data from postmarketOS-devices.json

    @samueldr
    samueldr committed Nov 7, 2019
    Copy the full SHA
    0f648ef View commit details

  5. Merge pull request #34 from samueldr-wip/feature/remove-external-info 

    Remove reliance on external information
    @samueldr
    samueldr authored Nov 7, 2019
    Copy the full SHA
    816faa0 View commit details
Showing with 65 additions and 2,212 deletions.
  1. +24 −1 devices/asus-flo/default.nix
  2. +26 −1 devices/asus-z00t/default.nix
  3. +0 −55 devices/devices-to-json.rb
  4. +0 −2,152 devices/postmarketOS-devices.json
  5. +15 −3 devices/qemu-x86_64/default.nix
25 changes: 24 additions & 1 deletion devices/asus-flo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,9 +2,32 @@

{
mobile.device.name = "asus-flo";
mobile.device.info = (lib.importJSON ../postmarketOS-devices.json).asus-flo // {
mobile.device.info = {
# TODO : make kernel part of options.
kernel = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
format_version = "0";
name = "Nexus 7 2013 Wifi";
manufacturer = "Asus";
date = "";
keyboard = false;
nonfree = "????";
dtb = "";
modules = "";
modules_initfs = "";
external_storage = false;
flash_method = "fastboot";
arch = "armhf";
dev_touchscreen = "/dev/input/event1";
screen_width = "1200";
screen_height = "1920";
generate_bootimg = true;
flash_offset_base = "0x80200000";
kernel_cmdline = "xxxxxxxxxxxxxxxxxxxxxxxxxxconsole=ttyMSM0,115200,n8 user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 vmalloc=340M";
flash_offset_kernel = "0x00008000";
flash_offset_ramdisk = "0x02000000";
flash_offset_second = "0x00f00000";
flash_offset_tags = "0x00000100";
flash_pagesize = "2048";
};
mobile.hardware = {
soc = "qualcomm-apq8064-1aa";
27 changes: 26 additions & 1 deletion devices/asus-z00t/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,32 @@

{
mobile.device.name = "asus-z00t";
mobile.device.info = (lib.importJSON ../postmarketOS-devices.json).asus-z00t // rec {
mobile.device.info = rec {
format_version = "0";
name = "Zenfone 2 Laser/Selfie (1080p)";
manufacturer = "Asus";
date = "";
modules_initfs = "";
arch = "aarch64";
keyboard = false;
external_storage = true;
screen_width = "1080";
screen_height = "1920";
dev_touchscreen = "";
dev_touchscreen_calibration = "";
dev_keyboard = "";
flash_method = "fastboot";
kernel_cmdline = "androidboot.hardware=qcom ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 androidboot.selinux=permissive";
generate_bootimg = true;
bootimg_qcdt = true;
flash_offset_base = "0x10000000";
flash_offset_kernel = "0x00008000";
flash_offset_ramdisk = "0x02000000";
flash_offset_second = "0x00f00000";
flash_offset_tags = "0x00000100";
flash_pagesize = "2048";
pm_name = "asus-z00t";

# TODO : make kernel part of options.
kernel = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
dtb = "${kernel}/dtbs/asus-z00t.img";
55 changes: 0 additions & 55 deletions devices/devices-to-json.rb
View file

This file was deleted.

2,152 changes: 0 additions & 2,152 deletions devices/postmarketOS-devices.json
View file

This file was deleted.

18 changes: 15 additions & 3 deletions devices/qemu-x86_64/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,20 @@ let
splash = config.mobile.boot.stage-1.splash.enable;

kernel = pkgs.linuxPackages_4_19.kernel;
device_info = (lib.importJSON ../postmarketOS-devices.json).qemu-amd64;
device_info = {
# format_version = "0";
# name = "Qemu amd64";
# manufacturer = "Qemu";
# date = "";
# keyboard = true;
# nonfree = "????";
# dtb = "";
# modules_initfs = "qxl drm_bochs";
# external_storage = true;
# flash_method = "none";
# generate_legacy_uboot_initfs = false;
# arch = "x86_64";
};

modules = [
# Disk images
@@ -47,8 +60,7 @@ in
mobile.device.info = device_info // {
# TODO : make kernel part of options.
inherit kernel;
kernel_cmdline = device_info.kernel_cmdline
+ " vga=${MODE.vga}"
kernel_cmdline = "console=tty1 console=ttyS0 vga=${MODE.vga}"
# TODO : make cmdline configurable outside device.info (device.info would be used for device-specifics only)
+ lib.optionalString splash " quiet vt.global_cursor_default=0"
;