Merge remote-tracking branch 'longsleep/master'

Author: ayufan

package/root/usr/local/sbin/pine64_health.sh

@@ -14,6 +14,8 @@ if [ "$(id -u)" -ne "0" ]; then
 	exit 1
 fi
 
+GPU_ADDR="1c40000.gpu"
+
 print() {
 	printf "%-15s: %s %s\n" "$1" "$2 $3" "$4"
 }
@@ -70,12 +72,41 @@ cooling_limit() {
 	print "Cooling limit" $limit
 }
 
+gpu_frequency() {
+	if [ ! -e /sys/devices/$GPU_ADDR/dvfs/manual ]; then
+		return
+	fi
+	local cur=$(cat /sys/devices/$GPU_ADDR/dvfs/manual|awk '{print $1}')
+	local mhz=$(awk "BEGIN {printf \"%.2f\",$cur}")
+	print "GPU freq" $mhz MHz
+}
+
+gpu_temp() {
+	if [ ! -e /sys/devices/$GPU_ADDR/dvfs/tempctrl ]; then
+		return
+	fi
+	local temp=$(cat /sys/devices/$GPU_ADDR/dvfs/tempctrl|awk '{print $6}')
+	print "GPU Temp" $temp "C"
+}
+
+gpu_voltage() {
+	if [ ! -e /sys/devices/$GPU_ADDR/dvfs/voltage ]; then
+		return
+	fi
+	local mv=$(cat /sys/devices/$GPU_ADDR/dvfs/voltage|awk '{print $1}')
+	local v=$(awk "BEGIN {printf \"%.2f\",$mv/1000}")
+	print "GPU voltage" $v "V"
+}
+
 all() {
 	cpu_frequency
+	gpu_frequency
 	cpu_count
 	scaling_govenor
 	vcore_voltage
+	gpu_voltage
 	soc_temp
+	gpu_temp
 	pmic_temp
 	cooling_state
 	cooling_limit

simpleimage/configuration-files/fstab

@@ -0,0 +1,3 @@
+# <file system>	<dir>	<type>	<options>			<dump>	<pass>
+/dev/mmcblk0p1	/boot	vfat	defaults			0		2
+/dev/mmcblk0p2	/		ext4	defaults,noatime	0		1

simpleimage/configuration-files/modprobe.d/blacklist-pine64.conf

@@ -0,0 +1,3 @@
+blacklist vfe_v4l2
+blacklist vfe_io
+blacklist 8723bs_vq0

simpleimage/configuration-files/modprobe.d/wifi-rt8723-pine64.conf

@@ -0,0 +1,3 @@
+# Disable secondary interface and power management.
+options 8723bs if2name=p2p0 rtw_power_mgnt=0
+options 8723cs if2name=p2p0 rtw_power_mgnt=0

simpleimage/configuration-files/modules-load.d/pine64-pinebook-hall.conf

@@ -0,0 +1,2 @@
+# Auto load hall driver (LID close).
+#hall

simpleimage/configuration-files/modules-load.d/pine64-speakers-jack.conf

@@ -0,0 +1,4 @@
+# Auto load the sndcodec driver (Audio jack, speakers) when not commented.
+#sunxi_codec
+#sunxi_i2s
+#sunxi_sndcodec

simpleimage/configuration-files/modules-load.d/pine64-wifi.conf

@@ -0,0 +1,2 @@
+8723bs
+#8723cs

simpleimage/configuration-files/pine64-firstboot.d/50-enable-pinebook-modules

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(cat /proc/device-tree/compatible)" != "pine64,pine64-plus,pinebook64" ]; then
+	exit 0
+fi
+
+# Enable sndcodec_module.
+if [ -e /etc/modules-load.d/pine64-speakers-jack.conf ]; then
+	sed -i "\
+		s/^#sunxi_codec$/sunxi_codec/g; \
+		s/^#sunxi_i2s$/sunxi_i2s/g; \
+		s/^#sunxi_sndcodec/sunxi_sndcodec/g; \
+	" /etc/modules-load.d/pine64-speakers-jack.conf
+fi
+
+# Enable hall module.
+if [ -e /etc/modules-load.d/pine64-pinebook-hall.conf ]; then
+	sed -i "s/^#hall$/hall/g" /etc/modules-load.d/pine64-pinebook-hall.conf
+fi
+
+# Disable 8723bs.
+if [ -e /etc/modules-load.d/pine64-wifi.conf ]; then
+	# NOTE(longsleep): Disable loading of bs driver. Unfortunately the module
+	# cannot be removed from the running Kernel without crashing. So this will
+	# become active on next boot.
+	sed -i "\
+		s/^8723bs$/#8723bs/g; \
+		s/^#8723cs$/8723cs/g; \
+	" /etc/modules-load.d/pine64-wifi.conf
+fi
+
+# There is no eth0 on Pinebook, grill it.
+if [ -e /etc/network/interfaces.d/eth0 ]; then
+	rm -f /etc/network/interfaces.d/eth0
+fi
+
+
+# Keep at the end, reload configs - will load configured modules if any.
+/bin/systemctl restart systemd-modules-load

simpleimage/configuration-files/udev-rules.d/90-sunxi-disp-permission.rules

@@ -0,0 +1,4 @@
+KERNEL=="disp", MODE="0770", GROUP="video"
+KERNEL=="cedar_dev", MODE="0770", GROUP="video"
+KERNEL=="ion", MODE="0770", GROUP="video"
+KERNEL=="mali", MODE="0770", GROUP="video"

simpleimage/make_rootfs.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Simple script to create a rootfs for aarch64 platforms including support
 # for Kernel modules created by the rest of the scripting found in this
@@ -23,6 +23,8 @@ if [ -z "$MODEL" ]; then
   MODEL="pine64"
 fi
 
+export LC_ALL=C
+
 if [ -z "$DEST" ]; then
 	echo "Usage: $0 <destination-folder> [<linux-tarball>] <package.deb> [distro] [<boot-folder>] [model] [variant: mate, i3 or empty]"
 	exit 1
@@ -353,12 +355,10 @@ mkdir -p "$DEST/lib"
 mkdir -p "$DEST/usr"
 
 # Create fstab
-cat <<EOF > "$DEST/etc/fstab"
-# <file system>	<dir>	<type>	<options>			<dump>	<pass>
-/dev/mmcblk0p1	/boot	vfat	defaults			0		2
-/dev/mmcblk0p2	/	ext4	defaults,noatime		0		1
-EOF
+cp -a ./configuration-files/fstab "$DEST/etc/fstab"
+chown root.root "$DEST/etc/fstab"
 
+# Direct Kernel install
 if [ -n "$LINUX" -a "$LINUX" != "-" -a -d "$LINUX" ]; then
 	# NOTE(longsleep): Passing Kernel as folder is deprecated. Pass a tarball!
 
@@ -414,5 +414,6 @@ fi
 # Clean up
 rm -f "$DEST/usr/bin/qemu-aarch64-static"
 rm -f "$DEST/usr/sbin/policy-rc.d"
+rm -f "$DEST/var/lib/dbus/machine-id"
 
 echo "Done - installed rootfs to $DEST"