Author: titmuss
Date: Wed Sep 3 04:57:59 2008
New Revision: 2897
URL: http://svn.slimdevices.com?rev=2897&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2890): awy | 2008-09-02 13:11:01 +0100
Add specific device-id for SP.
[EMAIL PROTECTED] (orig r2893): titmuss | 2008-09-03 11:49:27 +0100
Bug: N/A
Description:
Correct mtd partition name, jffs2 has always been used in production.
[EMAIL PROTECTED] (orig r2894): titmuss | 2008-09-03 12:24:55 +0100
Bug: N/A
Description:
Fix linux build version number, so the correct svn version tree is used.
[EMAIL PROTECTED] (orig r2895): titmuss | 2008-09-03 12:35:36 +0100
Bug: N/A
Description:
Correct mtd partition name, jffs2 has always been used in production.
[EMAIL PROTECTED] (orig r2896): titmuss | 2008-09-03 12:55:10 +0100
Bug: N/A
Description:
Improvements to init scripts, to allow experimentation with different flash
partitions and
platforms.
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
Removed:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_2.6.22.bb
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
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/share/applets/TestPlayback/TestPlaybackApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/Upgrade.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Sep 3 04:57:59 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2873
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2880
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2884
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2896
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/inittab
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab?rev=2897&root=Jive&r1=2896&r2=2897&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab
Wed Sep 3 04:57:59 2008
@@ -1,2 +1,2 @@
::sysinit:/etc/init.d/rcS
-tts/0::askfirst:/bin/sh
+::askfirst:/bin/sh
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc?rev=2897&root=Jive&r1=2896&r2=2897&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
Wed Sep 3 04:57:59 2008
@@ -14,7 +14,11 @@
/sbin/mdev -s
# Mount read/write filesystem
-/bin/mount -t jffs2 -o noatime /dev/mtdblock/2 /mnt/storage
+JFFS2_DEV=`grep jffs2 /proc/mtd | cut -c4`
+JFFS2_MTD=/dev/mtd/${JFFS2_DEV}
+JFFS2_MTDBLOCK=/dev/mtdblock/${JFFS2_DEV}
+
+/bin/mount -t jffs2 -o noatime ${JFFS2_MTDBLOCK} /mnt/storage
JFFS2_OK=$?
# Factory reset
@@ -23,8 +27,8 @@
/bin/echo "Factory Reset"
/bin/umount /mnt/storage
- /usr/sbin/flash_eraseall -q /dev/mtd/2
- /bin/mount -t jffs2 -o noatime /dev/mtdblock/2 /mnt/storage
+ /usr/sbin/flash_eraseall -q ${JFFS2_MTD}
+ /bin/mount -t jffs2 -o noatime ${JFFS2_MTDBLOCK} /mnt/storage
else
# Upgraded?
/usr/bin/diff -N /etc/squeezeos.version
/mnt/storage/etc/squeezeos.version > /dev/null 2> /dev/null
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=2897&root=Jive&r1=2896&r2=2897&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
Wed Sep 3 04:57:59 2008
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r10"
+PR = "r12"
SRC_URI = " \
file://config \
Added: 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb?rev=2897&root=Jive&view=auto
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
(added)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/linux/linux-jive_svn.bb
Wed Sep 3 04:57:59 2008
@@ -1,0 +1,53 @@
+DESCRIPTION = "Linux kernel for jive devices"
+SECTION = "kernel"
+LICENSE = "GPL"
+
+LINUX_VERSION = "2.6.22"
+PV = "${LINUX_VERSION}+${DISTRO_VERSION}+svnr${SRCREV}"
+PR = "r1"
+
+inherit kernel
+
+SRC_URI = " \
+ ${SQUEEZEOS_SVN}/s3c2412;proto=http;module=linux-${LINUX_VERSION} \
+ file://defconfig-jive \
+ "
+
+S = "${WORKDIR}/linux-${LINUX_VERSION}"
+
+COMPATIBLE_MACHINE = "(jive)"
+
+do_configure_prepend() {
+
+ rm -f ${S}/.config || true
+
+ if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" =
"linux-uclibcgnueabi" ]; then
+ echo "CONFIG_AEABI=y" >> ${S}/.config
+ echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
+ else
+ echo "# CONFIG_AEABI is not set" >> ${S}/.config
+ echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
+ fi
+
+ sed -e '/CONFIG_AEABI/d' \
+ -e '/CONFIG_OABI_COMPAT=/d' \
+ '${WORKDIR}/defconfig-${MACHINE}' >>'${S}/.config'
+
+ yes '' | oe_runmake oldconfig
+
+}
+
+# jive needs EXTRAVERSION -P7 for legacy reasons
+EXTRA_OEMAKE = "EXTRAVERSION=-P7"
+
+# adjust the package names to remove the -P7
+PKG_kernel-image = "kernel-image-${PV}"
+PKG_kernel-base = "kernel-${PV}"
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+ cd ${DEPLOY_DIR_IMAGE}
+ ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
${KERNEL_IMAGETYPE}-${MACHINE}.bin
+ tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz
-C ${D} lib
+}
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=2897&root=Jive&r1=2896&r2=2897&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
Wed Sep 3 04:57:59 2008
@@ -101,7 +101,7 @@
* 0x00200000-0x01600000 : cramfs A
* 0x01600000-0x017d0000 : zimage B
* 0x017d0000-0x02bd0000 : cramfs B
- * 0x02c00000-0x04000000 : yaffs
+ * 0x02c00000-0x04000000 : jffs2
*/
static struct mtd_partition jive_imageA_nand_part[] = {
@@ -130,9 +130,9 @@
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
- /* yaffs */
- {
- .name = "yaffs",
+ /* jffs2 */
+ {
+ .name = "jffs2",
.offset = (44*SZ_1M),
.size = (20*SZ_1M),
},
@@ -185,9 +185,9 @@
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
- /* yaffs */
- {
- .name = "yaffs",
+ /* jffs2 */
+ {
+ .name = "jffs2",
.offset = (44*SZ_1M),
.size = (20*SZ_1M),
},
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua?rev=2897&root=Jive&r1=2896&r2=2897&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua
Wed Sep 3 04:57:59 2008
@@ -108,7 +108,7 @@
local slimProto = SlimProto(jnt, ip, {
opcode = "HELO",
- deviceID = "4",
+ deviceID = "12",
revision = "0",
})
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/Upgrade.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/Upgrade.lua?rev=2897&root=Jive&r1=2896&r2=2897&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/Upgrade.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/Upgrade.lua
Wed Sep 3 04:57:59 2008
@@ -260,10 +260,10 @@
self._mtd["zImage"] = string.match(mtd, "mtd(%d+):[^\n]*zimage[^\n]*\n")
self._mtd["root.cramfs"] = string.match(mtd,
"mtd(%d+):[^\n]*cramfs[^\n]*\n")
- self._mtd["yaffs"] = string.match(mtd, "mtd(%d+):[^\n]*yaffs[^\n]*\n")
+ self._mtd["jffs2"] = string.match(mtd, "mtd(%d+):[^\n]*jffs2[^\n]*\n")
self._mtd["env"] = string.match(mtd, "mtd(%d+):[^\n]*env[^\n]*\n")
- for _, part in ipairs({"zImage", "root.cramfs", "yaffs", "env"}) do
+ for _, part in ipairs({"zImage", "root.cramfs", "jffs2", "env"}) do
if self._mtd[part] == nil then
return nil, "PROBLEM_PARSE_MTD"
else
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
