From c212558fba199ce2b14d69de31185a6f1cdd3929 Mon Sep 17 00:00:00 2001
From: Pierre Labadens <labadens.pierre@gmail.com>
Date: Sun, 29 Aug 2021 14:33:21 +0200
Subject: [PATCH 1/4] =?UTF-8?q?keyboard-updater:=202020-01-22=20=E2=86=92?=
 =?UTF-8?q?=202021-07-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboard-updater/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboard-updater/default.nix b/keyboard-updater/default.nix
index 6103458..3f3cf71 100644
--- a/keyboard-updater/default.nix
+++ b/keyboard-updater/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   pname = "pinebook-pro-keyboard-updater";
-  version = "2020-01-22";
+  version = "2021-07-28";
 
   nativeBuildInputs = [
     xxd
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
   '';
 
   src = fetchFromGitHub {
-    owner = "jackhumbert";
+    owner = "dragan-simic";
     repo = "pinebook-pro-keyboard-updater";
-    rev = "10535c84ee599d3225b02a391c6eb2f9d8d5cdbe";
-    sha256 = "1kk4qzliqn1r8vfx8zdfpkpqazhxr4v2baahhgmlsblh0cm1cxnc";
+    rev = "bd8d2ea48992b3e6ddd0b9435d21b74cdcf97224";
+    hash = "sha256-3+Qsa5lk1EJrLvPSyWthqBMTqJCigbJSmnsS6hdu+w8=";
   };
 }

From 359360935c637b5778554c41b17dd49a2f31c080 Mon Sep 17 00:00:00 2001
From: Pierre Labadens <labadens.pierre@gmail.com>
Date: Sat, 4 Sep 2021 14:45:14 +0200
Subject: [PATCH 2/4] README.md: document keyboard controller

Add a paragraph about identifying the SH68F83 keyboard controller IC.
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 88cf5ec..c6db1c3 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,11 @@ Note that the default U-Boot build does not do anything with LED on startup.
 >
 > It is unclear how to identify said hardware from a running system.
 
+To determine which keyboard controller you have, you will need to disassemble
+the Pinebook Pro as per [the Pine64
+wiki](https://wiki.pine64.org/wiki/Pinebook_Pro#Keyboard), and make sure that
+the IC next to the U23 marking on the main board is an **SH68F83**.
+
 ```
  $ nix-build -A pkgs.pinebookpro-keyboard-updater
  $ sudo ./result/bin/updater step-1 <iso|ansi>

From b7200b7461d8564470af08dbb7a8273cd06ba4e5 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 1 Nov 2021 19:37:11 -0400
Subject: [PATCH 3/4] Pin a known good Nixpkgs revision

This revision is used for unqualified `nix-build` uses.

For the previous behaviour, use:

```
nix-build --arg 'pkgs' 'import <nixpkgs> {}' -A kernel_latest
```

Build was tested through cross-compilation on an x86_64 machine.
---
 default.nix | 2 +-
 pkgs.nix    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 pkgs.nix

diff --git a/default.nix b/default.nix
index 1566fda..d47d361 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? (import ./pkgs.nix) {} }:
 
 let pkgs' = pkgs; in
 let
diff --git a/pkgs.nix b/pkgs.nix
new file mode 100644
index 0000000..ff97330
--- /dev/null
+++ b/pkgs.nix
@@ -0,0 +1,9 @@
+let
+  sha256 = "0j8pdr9ymk7a2p8pamcbq2rbhlcg923i6abdmdm6496973s5gb34";
+  rev = "e544ee88fa4590df75e221e645a03fe157a99e5b";
+in
+builtins.trace "(Using pinned Nixpkgs at ${rev})"
+import (fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
+  inherit sha256;
+})

From caa3d3e324c369454da05ef6558c44ee1a0ee234 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 1 Nov 2021 21:17:44 -0400
Subject: [PATCH 4/4] pinebook_pro.nix: Default to `_lts` build

The `_latest` kernel rotted away (kind of as expected).
---
 pinebook_pro.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pinebook_pro.nix b/pinebook_pro.nix
index 0523185..0f9efdc 100644
--- a/pinebook_pro.nix
+++ b/pinebook_pro.nix
@@ -6,7 +6,7 @@
     (import ./overlay.nix)
   ];
 
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_pinebookpro_latest;
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_pinebookpro_lts;
 
   # This list of modules is not entirely minified, but represents
   # a set of modules that is required for the display to work in stage-1.