Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[8319] branches/1.0
|
From: <abe...@us...> - 2017-05-21 03:10:17
|
Revision: 8319
http://sourceforge.net/p/astlinux/code/8319
Author: abelbeck
Date: 2017-05-21 03:10:15 +0000 (Sun, 21 May 2017)
Log Message:
-----------
Remove script support for 'net4801' and 'wrap'
Modified Paths:
--------------
branches/1.0/package/lm-sensors/lm-sensors.init
branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert
branches/1.0/project/astlinux/target_skeleton/etc/init.d/watchdog
branches/1.0/project/astlinux/target_skeleton/etc/rc
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
Modified: branches/1.0/package/lm-sensors/lm-sensors.init
===================================================================
--- branches/1.0/package/lm-sensors/lm-sensors.init 2017-05-21 02:36:00 UTC (rev 8318)
+++ branches/1.0/package/lm-sensors/lm-sensors.init 2017-05-21 03:10:15 UTC (rev 8319)
@@ -22,13 +22,8 @@
done
fi
- if grep -q "astlinux=net4801" /proc/cmdline; then
+ if grep -q "astlinux=net5501" /proc/cmdline; then
modprobe pc87360 init=2
- elif grep -q "astlinux=net5501" /proc/cmdline; then
- modprobe pc87360 init=2
- elif grep -q "astlinux=wrap" /proc/cmdline; then
- modprobe scx200_acb base=0x810,0x820
- modprobe lm77
elif grep -q "astlinux=alix" /proc/cmdline; then
modprobe scx200_acb base=0x810,0x820
modprobe lm90
@@ -51,13 +46,8 @@
done
fi
- if grep -q "astlinux=net4801" /proc/cmdline; then
+ if grep -q "astlinux=net5501" /proc/cmdline; then
modprobe -r pc87360
- elif grep -q "astlinux=net5501" /proc/cmdline; then
- modprobe -r pc87360
- elif grep -q "astlinux=wrap" /proc/cmdline; then
- modprobe -r lm77
- modprobe -r scx200_acb
elif grep -q "astlinux=alix" /proc/cmdline; then
modprobe -r lm90
modprobe -r scx200_acb
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert 2017-05-21 02:36:00 UTC (rev 8318)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert 2017-05-21 03:10:15 UTC (rev 8319)
@@ -117,16 +117,6 @@
welcome_msg
# Turn OFF the errorled (after finshed booting)
- if grep -q "astlinux=net4801" /proc/cmdline; then
-
- echo 0 > /sys/class/leds/net48xx::error/brightness
- fi
-
- if grep -q "astlinux=wrap" /proc/cmdline; then
-
- echo 0 > /sys/class/leds/wrap::error/brightness
- fi
-
if grep -q "astlinux=net5501" /proc/cmdline; then
echo 0 >/sys/class/leds/error/brightness
@@ -137,22 +127,11 @@
echo 0 > /sys/class/leds/alix:2/brightness
fi
- # LED control for Alix and WRAP boards (after finished booting)
+ # LED control for Alix board (after finished booting)
# "/mnt/kd/rc.ledcontrol" can override these settings
if [ -x /mnt/kd/rc.ledcontrol ]; then
/mnt/kd/rc.ledcontrol
else
- if grep -q "astlinux=wrap" /proc/cmdline; then
-
- echo heartbeat > /sys/class/leds/wrap::power/trigger
- # echo ide-disk > /sys/class/leds/wrap::error/trigger
- if [ -n "$EXTIF" ]; then
- echo netdev > /sys/class/leds/wrap::extra/trigger
- echo "$EXTIF" > /sys/class/leds/wrap::extra/device_name
- echo "link tx rx" > /sys/class/leds/wrap::extra/mode
- fi
- fi
-
if grep -q "astlinux=alix" /proc/cmdline; then
echo heartbeat > /sys/class/leds/alix:1/trigger
@@ -177,21 +156,6 @@
stop () {
# Turn on the errorled (on reboot/shutdown)
- if grep -q "astlinux=net4801" /proc/cmdline; then
-
- echo 1 > /sys/class/leds/net48xx::error/brightness
- fi
-
- if grep -q "astlinux=wrap" /proc/cmdline; then
-
- echo none > /sys/class/leds/wrap::power/trigger
- echo 1 > /sys/class/leds/wrap::power/brightness
- # echo none > /sys/class/leds/wrap::error/trigger
- echo 1 > /sys/class/leds/wrap::error/brightness
- echo none > /sys/class/leds/wrap::extra/trigger
- echo 0 > /sys/class/leds/wrap::extra/brightness
- fi
-
if grep -q "astlinux=net5501" /proc/cmdline; then
echo 1 >/sys/class/leds/error/brightness
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/watchdog
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/watchdog 2017-05-21 02:36:00 UTC (rev 8318)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/watchdog 2017-05-21 03:10:15 UTC (rev 8319)
@@ -3,11 +3,7 @@
. /etc/rc.conf
if [ "$WDMODULE" = "auto" ]; then
- if grep -q "astlinux=net4801" /proc/cmdline; then
- WDMODULE="scx200_wdt"
- elif grep -q "astlinux=wrap" /proc/cmdline; then
- WDMODULE="scx200_wdt"
- elif grep -q "astlinux=net5501" /proc/cmdline; then
+ if grep -q "astlinux=net5501" /proc/cmdline; then
WDMODULE="geodewdt"
elif grep -q "astlinux=alix" /proc/cmdline; then
WDMODULE="geodewdt"
Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-05-21 02:36:00 UTC (rev 8318)
+++ branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-05-21 03:10:15 UTC (rev 8319)
@@ -178,21 +178,6 @@
case $ASTLINUX in
- net4801)
- modprobe leds_net48xx
- sleep 1
- echo 1 >/sys/class/leds/net48xx::error/brightness
- ;;
-
- wrap)
- modprobe scx200_gpio
- modprobe leds_wrap
- modprobe ledtrig-heartbeat
- modprobe ledtrig-netdev
- sleep 1
- echo 1 >/sys/class/leds/wrap::error/brightness
- ;;
-
net5501)
modprobe cs5535_mfd
modprobe gpio_cs5535
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2017-05-21 02:36:00 UTC (rev 8318)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2017-05-21 03:10:15 UTC (rev 8319)
@@ -76,7 +76,7 @@
IS_SERIAL="-serial"
ARCH="${ARCH}${IS_SERIAL}"
fi
- elif [ "$ARCH" = "net5501" -o "$ARCH" = "alix" -o "$ARCH" = "net4801" -o "$ARCH" = "wrap" ]; then
+ elif [ "$ARCH" = "net5501" -o "$ARCH" = "alix" ]; then
IS_SERIAL="-serial"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
