From 90efdd3c995e3c618b0d49b63298b3af0a635882 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 24 Jan 2019 22:38:00 -0800
Subject: [PATCH] add NST wifi

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 make-factory-sdcard/Makefile |  5 ++++-
 u-boot/uboot                 | 16 ++++++++++++++++
 u-boot/uboot-bash-completion |  2 +-
 wifi/Makefile                |  8 ++++++++
 wifi/NST.conf                |  4 ++++
 wifi/wit-phone.conf          |  4 ++++
 6 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 wifi/NST.conf
 create mode 100644 wifi/wit-phone.conf

diff --git a/make-factory-sdcard/Makefile b/make-factory-sdcard/Makefile
index 867c2e3..eb98129 100644
--- a/make-factory-sdcard/Makefile
+++ b/make-factory-sdcard/Makefile
@@ -13,10 +13,13 @@ install-onto-sdcard:
 	mount /dev/sdb1 /mnt/sdcard/
 	dd if=/home/pinebook/u-boot-jcarr/u-boot-sunxi-with-spl.bin of=/dev/sdb bs=1K seek=8
 	cd /mnt/sdcard/ && rsync -av --progress /home/pinebook/factory/jcarr-factory-sdcard/ .
+	cp -a rc.local /mnt/sdcard/etc/rc.local
+	cp -a rc.root.local /mnt/sdcard/root/rc.local
 	umount /mnt/sdcard
 	sync
 	mount /dev/sdb2 /mnt/sdcard-image/
-	rsync -av --progress /home/pinebook/factory/community-builds/Armbian_5.69_Pinebook-a64_Ubuntu_bionic_next_4.19.13_desktop.img /mnt/sdcard-image/emmc.img
+	# rsync -av --progress /home/pinebook/factory/community-builds/Armbian_5.69_Pinebook-a64_Ubuntu_bionic_next_4.19.13_desktop.img /mnt/sdcard-image/emmc.img
+	rsync -av --progress /home/pinebook/factory/mmcblk2-factory-jcarr-test1 /mnt/sdcard-image/emmc.img
 	umount /mnt/sdcard-image/
 	sync
 
diff --git a/u-boot/uboot b/u-boot/uboot
index 01679c1..b395759 100755
--- a/u-boot/uboot
+++ b/u-boot/uboot
@@ -59,6 +59,16 @@ case "$1" in
 			echo uboot did not successfully compile
 		fi
 	;;
+	fetch)
+		git fetch --all
+	;;
+	flatten)
+		git fetch --all
+		git checkout work
+		git merge trini/master
+		git push
+		git diff trini/master...work >/tmp/flatten.diff
+	;;
 	remotes)
 		git remote -v
 	;;
@@ -79,7 +89,13 @@ case "$1" in
 
 	*)
 		echo
+		echo 'general git stuff:'
+		echo 'uboot remotes  -- shows the different git remotes'
 		echo 'uboot branches -- shows the git repos and branches'
+		echo 'uboot fetch    -- update all the remote brances'
+		echo 'uboot flatten  -- flattens jcarr/work against trini/master into jcarr/flatten'
+		echo ''
+		echo 'uboot stuff:'
 		echo 'uboot deps     -- install all the build dependancies'
 		echo 'uboot cross    -- set up the x86 cross compiler needed env. lame.'
 		echo 'uboot clean    -- purges more or less absolutely everything except .*'
diff --git a/u-boot/uboot-bash-completion b/u-boot/uboot-bash-completion
index 8a92839..17db6f7 100644
--- a/u-boot/uboot-bash-completion
+++ b/u-boot/uboot-bash-completion
@@ -5,7 +5,7 @@ _uboot()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $( compgen -W "remotes branches deps cross clean build flash" -- "$cur" ) )
+    COMPREPLY=( $( compgen -W "remotes branches deps cross clean build flash flatten" -- "$cur" ) )
 } &&
 complete -F _uboot uboot
 
diff --git a/wifi/Makefile b/wifi/Makefile
index fc31b0f..df00650 100755
--- a/wifi/Makefile
+++ b/wifi/Makefile
@@ -3,6 +3,11 @@ all:
 	sleep 10
 	make dhclient
 
+NST:
+	make killall ; make mac ; wpa_supplicant -d -i wlan0 -c NST.conf &
+	sleep 10
+	make dhclient
+
 help:
 	@echo on boot run:
 	@echo make killall # to kill wpa_supplicant
@@ -26,6 +31,9 @@ mac:
 debugging:
 	wpa_supplicant -d -i wlan0 -c wpa-supplicant.conf 
 
+wit-phone:
+	wpa_supplicant -d -i wlan0 -c wit-phone.conf
+
 background:
 	wpa_supplicant -B -d -i wlan0 -c wpa-supplicant.conf 
 
diff --git a/wifi/NST.conf b/wifi/NST.conf
new file mode 100644
index 0000000..a408014
--- /dev/null
+++ b/wifi/NST.conf
@@ -0,0 +1,4 @@
+network={
+	ssid="FYX_421C13"
+	psk="qq123456"
+}
diff --git a/wifi/wit-phone.conf b/wifi/wit-phone.conf
new file mode 100644
index 0000000..832a682
--- /dev/null
+++ b/wifi/wit-phone.conf
@@ -0,0 +1,4 @@
+network={
+	ssid="WIT Phone"
+	psk="basilarchia"
+}