[oe-commits] org.oe.dev merge of '9d487e0e820ff337d6de3af6ade625bea99a13f0'
hrw commit
openembedded-commits at lists.openembedded.org
Tue Oct 30 18:58:17 UTC 2007
merge of '9d487e0e820ff337d6de3af6ade625bea99a13f0'
and 'f4f4fd93a0ba107d720385c50418ba1e95de7e91'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d336ecfbafd630f83489624d1ed72c11c20ef24f
ViewMTN: http://monotone.openembedded.org/revision/info/d336ecfbafd630f83489624d1ed72c11c20ef24f
Files:
1
packages/altboot/files
packages/altboot/files/sd-dynamic-fix.patch
conf/machine/mpc8323e-rdb.conf
packages/altboot/altboot_1.1.1+wip-SVNR66.bb
packages/gsm/gsmd.inc
packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
packages/openmoko2/openmoko-worldclock2_svn.bb
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r9d487e0e820ff337d6de3af6ade625bea99a13f0 -rd336ecfbafd630f83489624d1ed72c11c20ef24f
#
#
#
# add_dir "packages/altboot/files"
#
# add_file "packages/altboot/files/sd-dynamic-fix.patch"
# content [6ce619d3da3cee65ea33597fac52722e50f381a8]
#
# patch "conf/machine/mpc8323e-rdb.conf"
# from [1876804ee7967f652de2c1f471a25ebc5b375451]
# to [0b3c9c53c06895961335926d64286bd0e0e1b734]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR66.bb"
# from [7cb617a49e20203b0f89fb39efef91b8ec68009a]
# to [32cf1f7f5740db54ab2208b1cbf3daf0fb4b01c0]
#
# patch "packages/gsm/gsmd.inc"
# from [83093d650bcdbc65dee74f3058fd005d42e2d193]
# to [1d31a35594ce0b4c1ab114d1d3e5de11da773c2d]
#
# patch "packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig"
# from [508a89d1984e4bdb7c408c09476667ee02a6bf94]
# to [bc7a239a9553186d8ab843e372206328b55f5a9c]
#
# patch "packages/openmoko2/openmoko-worldclock2_svn.bb"
# from [7f86ee9c3bfabf8d397a2efbfb85f67fd61066a7]
# to [2cc4090d85a7ec780f069c0211ae2ba1d6cff205]
#
============================================================
--- packages/altboot/files/sd-dynamic-fix.patch 6ce619d3da3cee65ea33597fac52722e50f381a8
+++ packages/altboot/files/sd-dynamic-fix.patch 6ce619d3da3cee65ea33597fac52722e50f381a8
@@ -0,0 +1,44 @@
+Index: trunk/altboot.func
+===================================================================
+--- trunk.orig/altboot.func 2007-10-30 15:48:16.000000000 +0000
++++ trunk/altboot.func 2007-10-30 15:48:21.000000000 +0000
+@@ -499,17 +499,6 @@
+ then
+ echo "Note: $SD_MOUNTPOINT is already mounted"
+ else
+- # We can't trust that the SD device file is there when running kernel 2.6 w/ udev
+- # and starting udev at this point may not be the best idea...
+- if `uname -r | grep -q "2.6"`
+- then
+- #Let's just assume the device file name never changes...
+- dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`"
+- part_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`"
+- ! test -e /dev/mmcblk${dev_no} && mknod /dev/mmcblk${dev_no} b 254 0
+- ! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no
+- fi
+-
+ # Kernel 2.6 has the SD driver compiled into the kernel
+ if test -n "$SD_KERNEL_MODULE"
+ then
+@@ -544,6 +533,21 @@
+ fi
+ fi
+
++ # We can't trust that the SD device file is there when running kernel 2.6 w/ udev
++ # and starting udev at this point may not be the best idea...
++ if `uname -r | grep -q "2.6"`
++ then
++ #Let's just assume the device file name never changes...
++ dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`"
++ part_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`"
++ if [ -f /sys/block/mmcblk${dev_no}/mmcblk${dev_no}p${part_no}/dev ]
++ then
++ rm -f /dev/mmcblk${dev_no}p${part_no} || true
++ mknod /dev/mmcblk${dev_no}p${part_no} b `cat /sys/block/mmcblk${dev_no}/mmcblk${dev_no}p${part_no}/dev|sed 's/:/ /' `
++ fi
++
++ fi
++
+ sleep 3
+
+ check_fs "$SD_DEVICE"
============================================================
--- conf/machine/mpc8323e-rdb.conf 1876804ee7967f652de2c1f471a25ebc5b375451
+++ conf/machine/mpc8323e-rdb.conf 0b3c9c53c06895961335926d64286bd0e0e1b734
@@ -13,6 +13,8 @@ UBOOT_MACHINE = "MPC8323ERDB_config"
PREFERRED_VERSION_u-boot = "git"
UBOOT_MACHINE = "MPC8323ERDB_config"
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
+
#don't try to access tty1
USE_VT = "0"
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR66.bb 7cb617a49e20203b0f89fb39efef91b8ec68009a
+++ packages/altboot/altboot_1.1.1+wip-SVNR66.bb 32cf1f7f5740db54ab2208b1cbf3daf0fb4b01c0
@@ -1,9 +1,10 @@ require altboot.inc
require altboot.inc
-PR = "r0"
+PR = "r1"
SVN_REV = "66"
-SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV}"
+SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
+ file://sd-dynamic-fix.patch;patch=1"
do_install() {
install -d ${D}/sbin
============================================================
--- packages/gsm/gsmd.inc 83093d650bcdbc65dee74f3058fd005d42e2d193
+++ packages/gsm/gsmd.inc 1d31a35594ce0b4c1ab114d1d3e5de11da773c2d
@@ -1,11 +1,11 @@ PROVIDES += "gsmd"
DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
HOMEPAGE = "http://www.openmoko.org"
LICENSE = "GPL LGPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
-RPROVIDES_${PN} = "libgsmd0"
+RPROVIDES_${PN} = "libgsmd0 gsmd"
PV = "0.1+svnr${SRCREV}"
-PR = "r33"
+PR = "r34"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
============================================================
--- packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig 508a89d1984e4bdb7c408c09476667ee02a6bf94
+++ packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig bc7a239a9553186d8ab843e372206328b55f5a9c
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc4
-# Tue Aug 28 21:27:19 2007
+# Linux kernel version: 2.6.23
+# Tue Oct 30 11:07:43 2007
#
# CONFIG_PPC64 is not set
@@ -83,7 +83,6 @@ CONFIG_SIGNALFD=y
CONFIG_ANON_INODES=y
# CONFIG_EPOLL is not set
CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
@@ -185,6 +184,8 @@ CONFIG_PROC_DEVICETREE=y
CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set
# CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
CONFIG_SECCOMP=y
CONFIG_WANT_DEVICE_TREE=y
CONFIG_DEVICE_TREE=""
@@ -323,7 +324,83 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0xFE000000
+CONFIG_MTD_PHYSMAP_LEN=0x01000000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PHYSMAP_OF is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
CONFIG_OF_DEVICE=y
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
@@ -485,6 +562,7 @@ CONFIG_E1000=y
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
@@ -988,6 +1066,15 @@ CONFIG_RAMFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
@@ -1104,6 +1191,8 @@ CONFIG_CRC32=y
CONFIG_CRC32=y
# CONFIG_CRC7 is not set
# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
============================================================
--- packages/openmoko2/openmoko-worldclock2_svn.bb 7f86ee9c3bfabf8d397a2efbfb85f67fd61066a7
+++ packages/openmoko2/openmoko-worldclock2_svn.bb 2cc4090d85a7ec780f069c0211ae2ba1d6cff205
@@ -1,6 +1,6 @@ SECTION = "openmoko/tools"
DESCRIPTION = "A World-Clock for OpenMoko"
SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 openmoko-dates2"
+DEPENDS = "libmokoui2 openmoko-dates2 libnotify"
PV = "0.1.0+svnr${SRCREV}"
inherit openmoko2
#
# mt diff -rf4f4fd93a0ba107d720385c50418ba1e95de7e91 -rd336ecfbafd630f83489624d1ed72c11c20ef24f
#
#
#
# patch "packages/tasks/task-base.bb"
# from [44e93e6ba745b771c46f37d723b223f988c5e64e]
# to [cdcb312e0d4f77e69ca83bf82f6643335a03135c]
#
============================================================
--- packages/tasks/task-base.bb 44e93e6ba745b771c46f37d723b223f988c5e64e
+++ packages/tasks/task-base.bb cdcb312e0d4f77e69ca83bf82f6643335a03135c
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r43"
+PR = "r44"
inherit task
More information about the Openembedded-commits
mailing list