Author: richard
Date: Fri Jan 30 03:37:26 2009
New Revision: 3994
URL: http://svn.slimdevices.com?rev=3994&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3991): richard | 2009-01-30 10:34:01 +0000
Bug: N/A
Description:
Include a read-only flash partition for the bootloader.
r3...@harrypotter (orig r3992): richard | 2009-01-30 10:35:44 +0000
Bug: N/A
Description:
The "Return to setup" menu was missing after pressing and holding left in
setup.
r3...@harrypotter (orig r3993): richard | 2009-01-30 10:45:39 +0000
Bug: N/A
Description:
Add more logging for wlan and suspend to syslog.
Log md5sum of the bootloader when booting (if logging to an sd card).
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/wlan
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jan 30 03:37:26 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3952
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3993
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS?rev=3994&root=Jive&r1=3993&r2=3994&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS Fri
Jan 30 03:37:26 2009
@@ -29,6 +29,9 @@
echo "Enabling core files (to $LOG_DIR)"
echo "$LOG_DIR/core-%e" > /proc/sys/kernel/core_pattern
ulimit -c unlimited
+
+ # Verify uboot by logging md5sum
+ /usr/bin/logger -t uboot `nanddump -q /dev/mtd/6 | md5sum` &
else
# log to /var
echo "Starting syslogd"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend?rev=3994&root=Jive&r1=3993&r2=3994&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/suspend
Fri Jan 30 03:37:26 2009
@@ -9,10 +9,11 @@
NOW=`cat /sys/devices/platform/s3c2410-rtc/rtc\:rtc0/since_epoch`
WAKEAT=$(($NOW + $SECONDS))
- echo "Wakeat $WAKEAT"
+ /usr/bin/logger -s "Suspend wakeat $WAKEAT"
echo $WAKEAT > /sys/devices/platform/s3c2410-rtc/rtc\:rtc0/wakealarm
fi
+/usr/bin/logger -s "suspending ..."
# Stop wlan
/etc/init.d/wlan stop
@@ -25,7 +26,13 @@
echo "1" > /sys/bus/i2c/devices/0-001c/resume
# Suspend
+/usr/bin/logger -s "suspend"
+/bin/sync
+
echo 'mem' > /sys/power/state
+
+/usr/bin/logger -s "resume ..."
+/bin/sync
# Restore accelerometer parameters
echo $DURATION > /sys/bus/i2c/devices/0-001c/duration
@@ -33,3 +40,5 @@
# Start wlan (in the background)
/etc/init.d/wlan start &
+
+/usr/bin/logger -s "resumed"
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/wlan
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/wlan?rev=3994&root=Jive&r1=3993&r2=3994&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/wlan
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/wlan Fri
Jan 30 03:37:26 2009
@@ -10,7 +10,7 @@
case "$1" in
start)
- echo "Starting wlan"
+ /usr/bin/logger -s "Starting wlan"
# Load wlan drivers
/sbin/insmod gspi.ko
@@ -37,14 +37,14 @@
/sbin/iwconfig eth0 power on
# Start wpa supplicant
- /usr/bin/logger "Starting wpa_supplicant"
+ /usr/bin/logger -s "Starting wpa_supplicant"
/usr/sbin/wpa_supplicant -B -Dmarvell -ieth0 -c/etc/wpa_supplicant.conf
/usr/sbin/wpa_cli -B -a/etc/network/wpa_action
- /usr/bin/logger "Started wpa_supplicant"
+ /usr/bin/logger -s "Started wpa_supplicant"
;;
stop)
- echo "Stopping wlan"
+ /usr/bin/logger -s "Stopping wlan"
# Stop wpa supplicant
killall wpa_cli
@@ -64,13 +64,15 @@
done
fi
- echo "Taking down eth0..."
+ /usr/bin/logger -s "Taking down eth0..."
ifconfig eth0 down
/bin/rm -rf /var/run/ifstate
# Remove wlan drivers
rmmod gspi8xxx gspi
+
+ /usr/bin/logger -s "wlan stopped"
;;
*)
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=3994&root=Jive&r1=3993&r2=3994&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Fri Jan 30 03:37:26 2009
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r24"
+PR = "r25"
SRC_URI = " \
file://85-mtd.rules \
Modified:
7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c?rev=3994&root=Jive&r1=3993&r2=3994&view=diff
==============================================================================
---
7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
(original)
+++
7.4/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
Fri Jan 30 03:37:26 2009
@@ -104,28 +104,68 @@
* 0x02c00000-0x04000000 : jffs2
*/
static struct mtd_partition jive_imageA_nand_part[] = {
-
-#if 0
- /* Don't allow access to the bootloader from linux */
+ /* booted images */
+ {
+ .name = "kernel (ro)",
+ .offset = (192*SZ_1K),
+ .size = (2*SZ_1M) - (192*SZ_1K),
+ .mask_flags = MTD_WRITEABLE, /* force read-only */
+ },
+
+ {
+ .name = "root (ro)",
+ .offset = (2*SZ_1M),
+ .size = (20*SZ_1M),
+ .mask_flags = MTD_WRITEABLE, /* force read-only */
+ },
+
+ /* jffs2 */
+ {
+ .name = "jffs2",
+ .offset = (44*SZ_1M),
+ .size = (20*SZ_1M),
+ },
+
+ /* bootloader environment */
+ {
+ .name = "env",
+ .offset = (160*SZ_1K),
+ .size = 2 * (16*SZ_1K),
+ },
+
+ /* upgrade images */
+ {
+ .name = "zimage",
+ .offset = (22*SZ_1M),
+ .size = (2*SZ_1M) - (192*SZ_1K),
+ },
+
+ {
+ .name = "cramfs",
+ .offset = (24*SZ_1M) - (192*SZ_1K),
+ .size = (20*SZ_1M),
+ },
+ /* allow R/O access to the bootloader from linux */
{
.name = "uboot",
.offset = 0,
.size = (160*SZ_1K),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
-#endif
-
+};
+
+static struct mtd_partition jive_imageB_nand_part[] = {
/* booted images */
{
.name = "kernel (ro)",
- .offset = (192*SZ_1K),
+ .offset = (22*SZ_1M),
.size = (2*SZ_1M) - (192*SZ_1K),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
{
.name = "root (ro)",
- .offset = (2*SZ_1M),
+ .offset = (24*SZ_1M) - (192*SZ_1K),
.size = (20*SZ_1M),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
@@ -147,70 +187,22 @@
/* upgrade images */
{
.name = "zimage",
- .offset = (22*SZ_1M),
+ .offset = (192*SZ_1K),
.size = (2*SZ_1M) - (192*SZ_1K),
},
{
.name = "cramfs",
- .offset = (24*SZ_1M) - (192*SZ_1K),
+ .offset = (2*SZ_1M),
.size = (20*SZ_1M),
},
-};
-
-static struct mtd_partition jive_imageB_nand_part[] = {
-
-#if 0
- /* Don't allow access to the bootloader from linux */
+ /* allow read-only access to the bootloader from linux */
{
.name = "uboot",
.offset = 0,
.size = (160*SZ_1K),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
-#endif
-
- /* booted images */
- {
- .name = "kernel (ro)",
- .offset = (22*SZ_1M),
- .size = (2*SZ_1M) - (192*SZ_1K),
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
-
- {
- .name = "root (ro)",
- .offset = (24*SZ_1M) - (192*SZ_1K),
- .size = (20*SZ_1M),
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
-
- /* jffs2 */
- {
- .name = "jffs2",
- .offset = (44*SZ_1M),
- .size = (20*SZ_1M),
- },
-
- /* bootloader environment */
- {
- .name = "env",
- .offset = (160*SZ_1K),
- .size = 2 * (16*SZ_1K),
- },
-
- /* upgrade images */
- {
- .name = "zimage",
- .offset = (192*SZ_1K),
- .size = (2*SZ_1M) - (192*SZ_1K),
- },
-
- {
- .name = "cramfs",
- .offset = (2*SZ_1M),
- .size = (20*SZ_1M),
- },
};
static struct nand_ecclayout jive_nand_oob = {
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=3994&root=Jive&r1=3993&r2=3994&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Fri Jan 30 03:37:26 2009
@@ -51,6 +51,10 @@
function notify_playerCurrent(self, player)
+ if player == nil then
+ return
+ end
+
log:info("setup complete")
-- setup is completed when a player is selected
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
