From 248244f600dfd532c59e2abe6655ea17d00d62f9 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 18 Oct 2020 23:17:30 -0700
Subject: [PATCH] Initial work on WiFi

Kernel module builds fine, and it's detected as a device. But it fails
with mmc errors when starting wpa_supplicant
---
 README.md         |  7 ++++++-
 build.sh          |  2 +-
 configuration.nix | 16 +++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5bcebd8..1aaa645 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,12 @@ dmesg error: `spi-nor spi0.0: unrecognized JEDEC id bytes: 0b 40 18 0b 40 18`
 Working fine in linux. U-boot needs support
 
 ## WIFI
-Not working
+Dmesg errors:
+```
+Oct 19 06:11:31 nixos wpa_supplicant[926]: Successfully initialized wpa_supplicant
+Oct 19 06:11:32 nixos kernel: sunxi-mmc 1c10000.mmc: data error, sending stop command
+Oct 19 06:11:32 nixos kernel: sunxi-mmc 1c10000.mmc: send stop command failed
+```
 
 ## Audio
 Is not in currently in DTB at all.
diff --git a/build.sh b/build.sh
index ad28282..582cad0 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
 nix-build "<nixpkgs/nixos>" \
-    -I nixpkgs=https://github.com/danielfullmer/nixpkgs/archive/409e2f8cf43ba86b1de710308ca0e9aa29d5fc60.tar.gz \
+    -I nixpkgs=https://github.com/danielfullmer/nixpkgs/archive/e69838e006a7271006ab834b521187891bf93ff4.tar.gz \
     -I nixos-config=./configuration.nix \
     -A config.system.build.sdImage
diff --git a/configuration.nix b/configuration.nix
index 93213ff..cf4eeec 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -38,9 +38,23 @@ in
   # See: https://lore.kernel.org/patchwork/project/lkml/list/?submitter=22013&order=name
   boot.kernelPackages = pkgs.linuxPackages_5_9;
   boot.kernelPatches = [
-    { name = "pine64-pinecube"; patch = ./Pine64-PineCube-support.patch; }
+    { name = "pine64-pinecube";
+      patch = ./Pine64-PineCube-support.patch;
+      # sunxi_defconfig is missing wireless support
+      # TODO: Are all of these options needed here?
+      extraConfig = ''
+        CFG80211 m
+        WIRELESS y
+        WLAN y
+        RFKILL y
+        RFKILL_INPUT y
+        RFKILL_GPIO y
+      '';
+    }
   ];
 
+  boot.extraModulePackages = [ config.boot.kernelPackages.rtl8189es ];
+
   environment.systemPackages = with pkgs; [
     alsaUtils
     ffmpeg