diff --git a/config/boot-guitar.cmd b/config/boot-guitar.cmd index 8edae0496..9a13bfb11 100644 --- a/config/boot-guitar.cmd +++ b/config/boot-guitar.cmd @@ -1,4 +1,4 @@ -setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk1p2 rw console=tty0 rootfstype=ext4 console=ttyS3 loglevel=4 rootwait" +setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk0p2 rw console=tty0 rootfstype=ext4 console=ttyS3 loglevel=1 rootwait" setenv os_type linux fatload mmc 0:1 0x04000000 dtb/lemaker_guitar_bbb.dtb fatload mmc 0:1 0x7fc0 zImage diff --git a/configuration.sh b/configuration.sh index beac47997..0d115cffe 100644 --- a/configuration.sh +++ b/configuration.sh @@ -248,7 +248,7 @@ OFFSET="16" BOOTSIZE="16" BOOTCONFIG="s500_defconfig" - MODULES="ethernet wlan_8723bs bonding" + MODULES="ethernet wlan_8723bs" MODULES_NEXT="" SERIALCON="ttyS3" ;; diff --git a/scripts/armhwinfo b/scripts/armhwinfo index de81cad78..0197173f3 100644 --- a/scripts/armhwinfo +++ b/scripts/armhwinfo @@ -46,8 +46,12 @@ done if [ "$ARCH" = "armv7l" ]; then if [ $HARDWARE = "ODROID-XU3" ]; then - ID="Odroid" - fi + ID="Odroid" + fi + if [ $HARDWARE = "gs705a" ]; then + ID="Guitar" + fi + if [ $HARDWARE = "sun4i" ] || [ $HARDWARE = "Allwinner" ]; then ID="Cubieboard" fi diff --git a/scripts/bashrc b/scripts/bashrc index 3b3f0812d..6d918c371 100644 --- a/scripts/bashrc +++ b/scripts/bashrc @@ -46,6 +46,12 @@ TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone0/temp) TEMP=$(echo "scale=1;${TEMP}/1000" | bc) fi +# thermal zone on lemaker guitar +if [[ -d "/sys/devices/virtual/thermal/thermal_zone1/" && $TEMP == "0" ]]; then +TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone1/temp) +TEMP=$(echo "scale=1;${TEMP}/1000" | bc) +fi + if [[ -n $TEMP ]]; then OUT="${OUT}- Board: ${TEMP}${CEL} " fi