diff options
-rw-r--r-- | conf/machine/mpc8323e-rdb.conf | 2 | ||||
-rw-r--r-- | packages/altboot/altboot_1.1.1+wip-SVNR66.bb | 5 | ||||
-rw-r--r-- | packages/altboot/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/altboot/files/sd-dynamic-fix.patch | 44 | ||||
-rw-r--r-- | packages/gsm/gsmd.inc | 4 | ||||
-rw-r--r-- | packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig | 97 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-worldclock2_svn.bb | 2 |
7 files changed, 145 insertions, 9 deletions
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index 0335cb6249..a6b29552c5 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -13,6 +13,8 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" 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" diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR66.bb b/packages/altboot/altboot_1.1.1+wip-SVNR66.bb index 912082c70f..0eda8ba44b 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR66.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR66.bb @@ -1,9 +1,10 @@ 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 diff --git a/packages/altboot/files/.mtn2git_empty b/packages/altboot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/altboot/files/.mtn2git_empty diff --git a/packages/altboot/files/sd-dynamic-fix.patch b/packages/altboot/files/sd-dynamic-fix.patch new file mode 100644 index 0000000000..f31c6b8dc7 --- /dev/null +++ b/packages/altboot/files/sd-dynamic-fix.patch @@ -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" diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index 385a0095a1..8b3fe8fb82 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -3,9 +3,9 @@ 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 \ diff --git a/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig b/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig index 6d1c3e8420..0acf0ada2d 100644 --- a/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig +++ b/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig @@ -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_FUTEX=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_VIRT_TO_BUS=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_BITREVERSE=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 diff --git a/packages/openmoko2/openmoko-worldclock2_svn.bb b/packages/openmoko2/openmoko-worldclock2_svn.bb index 8fc6f11f57..bb849accfb 100644 --- a/packages/openmoko2/openmoko-worldclock2_svn.bb +++ b/packages/openmoko2/openmoko-worldclock2_svn.bb @@ -1,6 +1,6 @@ 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 |