Author: vferey
Date: Thu Aug 12 16:29:11 2010
New Revision: 9045
URL: http://svn.slimdevices.com/jive?rev=9045&view=rev
Log:
Monitor the MSP430 at run-time to make sure that it is running and prevent the
Baby to go to infinite
loop in case of i2c failures.
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/rcS_monitor_msp430.patch
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/watchdog_conf.patch
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/monitor-hardware/monitor-hardware_1.0.bb
Modified: 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf?rev=9045&r1=9044&r2=9045&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf (original)
+++ 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/machine/baby.conf Thu Aug 12
16:29:11 2010
@@ -59,6 +59,7 @@
IMAGE_INSTALL += "squeezeplay-squeezeos"
IMAGE_INSTALL += "squeezeos-dsp"
IMAGE_INSTALL += "baby-msp430"
+IMAGE_INSTALL += "monitor-hardware"
IMAGE_SQUEEZEOS_UPGRADE = "1"
IMAGE_SQUEEZEOS_BOARD_VERSION = "\
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/rcS_monitor_msp430.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/rcS_monitor_msp430.patch?rev=9045&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/rcS_monitor_msp430.patch
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/rcS_monitor_msp430.patch
Thu Aug 12 16:29:11 2010
@@ -1,0 +1,14 @@
+Index: files/rcS
+===================================================================
+--- files.orig/rcS 2010-08-12 15:43:49.061174310 -0700
++++ files/rcS 2010-08-12 15:43:41.697175183 -0700
+@@ -62,6 +62,9 @@
+ # Start watchdog
+ /usr/sbin/watchdog
+
++#monitor the MSP430
++/etc/init.d/monitor_msp430.sh start
++
+ # Check booloader version
+ if [ -x /etc/init.d/blupdate ]; then
+ /etc/init.d/blupdate
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/watchdog_conf.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/watchdog_conf.patch?rev=9045&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/watchdog_conf.patch
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/baby/watchdog_conf.patch
Thu Aug 12 16:29:11 2010
@@ -1,0 +1,12 @@
+Index: files/watchdog.conf
+===================================================================
+--- files.orig/watchdog.conf 2010-08-05 19:52:10.890096455 -0700
++++ files/watchdog.conf 2010-08-05 19:52:20.094079526 -0700
+@@ -1,6 +1,7 @@
+
+ # Check squeezeplay and squeezecenter
+ pidfile = /var/run/squeezeplay.pid
++pidfile = /var/run/monitor_msp430.pid
+
+ # Note that this is the number of pages!
+ min-memory = 0
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=9045&r1=9044&r2=9045&view=diff
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Thu Aug 12 16:29:11 2010
@@ -59,6 +59,8 @@
file://redboot-baby-0001.bin \
file://redboot-baby-0002.bin \
file://rcS_init_msp430.patch;patch=1 \
+ file://watchdog_conf.patch;patch=1 \
+ file://rcS_monitor_msp430.patch;patch=1 \
"
S = "${WORKDIR}"
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/monitor-hardware/monitor-hardware_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/monitor-hardware/monitor-hardware_1.0.bb?rev=9045&r1=9044&r2=9045&view=diff
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/monitor-hardware/monitor-hardware_1.0.bb
(original)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/monitor-hardware/monitor-hardware_1.0.bb
Thu Aug 12 16:29:11 2010
@@ -14,6 +14,8 @@
do_install() {
install -m 0755 -d ${D}${sbindir}
+ install -m 0755 -d ${D}${sysconfdir}
+ install -m 0755 -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/monitor_msp430 ${D}${sbindir}/monitor_msp430
- install -m 0755 ${WORKDIR}/monitor_msp430.sh
${D}${etcdir}/monitor_msp430.sh
+ install -m 0755 ${WORKDIR}/monitor_msp430.sh
${D}${sysconfdir}/init.d/monitor_msp430.sh
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
