From e44fc51909a375f202f557818355b7e33efc4466 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Fri, 17 May 2019 09:47:10 +0200
Subject: [PATCH] Last fixups for Pinephone.

---
 boards/pinephone-dontbeevil.sh                      |  10 +++++-----
 .../lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin    | Bin
 .../lib/firmware/rtlwifi/rtl8723bs_bt.bin           | Bin
 .../lib/firmware/rtlwifi/rtl8723bs_nic.bin          | Bin
 .../lib/firmware/rtlwifi/rtl8723bs_wowlan.bin       | Bin
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename extra/{pinephone => pinephone-dontbeevil}/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin (100%)
 rename extra/{pinephone => pinephone-dontbeevil}/lib/firmware/rtlwifi/rtl8723bs_bt.bin (100%)
 rename extra/{pinephone => pinephone-dontbeevil}/lib/firmware/rtlwifi/rtl8723bs_nic.bin (100%)
 rename extra/{pinephone => pinephone-dontbeevil}/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin (100%)

diff --git a/boards/pinephone-dontbeevil.sh b/boards/pinephone-dontbeevil.sh
index 76b1aff..57daba6 100644
--- a/boards/pinephone-dontbeevil.sh
+++ b/boards/pinephone-dontbeevil.sh
@@ -80,13 +80,13 @@ postbuild() {
 	popd
 
 	cat <<EOF | sudo tee "${strapdir}/boot/boot.txt"
-setenv bootargs console=tty0 console=${console} root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 fbcon=rotate:1
+setenv bootargs console=tty0 console=\${console} root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 fbcon=rotate:1
 setenv kernel_addr_z 0x44080000
 
-if load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_z} Image.gz; then
-  unzip ${kernel_addr_z} ${kernel_addr_r}
-  if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} sun50i-a64-dontbeevil.dtb; then
-    booti ${kernel_addr_r} - ${fdt_addr_r};
+if load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_z} Image.gz; then
+  unzip \${kernel_addr_z} \${kernel_addr_r}
+  if load \${devtype} \${devnum}:\${distro_bootpart} \${fdt_addr_r} sun50i-a64-dontbeevil.dtb; then
+    booti \${kernel_addr_r} - \${fdt_addr_r};
   fi;
 fi
 EOF
diff --git a/extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin b/extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin
similarity index 100%
rename from extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin
rename to extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_ap_wowlan.bin
diff --git a/extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_bt.bin b/extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_bt.bin
similarity index 100%
rename from extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_bt.bin
rename to extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_bt.bin
diff --git a/extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_nic.bin b/extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_nic.bin
similarity index 100%
rename from extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_nic.bin
rename to extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_nic.bin
diff --git a/extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin b/extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin
similarity index 100%
rename from extra/pinephone/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin
rename to extra/pinephone-dontbeevil/lib/firmware/rtlwifi/rtl8723bs_wowlan.bin