merge of '2ba712b467ac5c686bf68f2c52317171b00a2a14'

     and '52be2ff079be681e1ba27f4d4342036b38404b89'

4 files changed, 18 insertions, 15 deletions

diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index e6199f7e23..ff0eb42a11 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -11,19 +11,27 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 require conf/machine/include/tune-xscale.inc
 
+# console serial port.  If you have a L module
+# the below works.  If you have a W module, add
+# the following line to your local.conf:
+#   CMX270_CONSOLE_SERIAL_PORT = "ttyS0"
+
+# the following is for the cm-x270 L module
+CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
+
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting
 # the following is the for the cm-x270 L module
 # I think the W module would use ttyS0, but has
 # not been tested.  This can be overwritten in 
 # local.conf
-SERIAL_CONSOLE ?= "38400 ttyS1"
+SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}"
 
 # used by opie-collections.inc
 ROOT_FLASH_SIZE ?= "32"
 
 # for NAND flash.
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\
 	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 	-e 0x20000 -p; \
@@ -37,12 +45,15 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
 # to program the compulab NAND flash, the following scheme is suggested.  Create
 # a small rootfs that can fit in NOR flash using the following config:
 #   - Angstrom distro
-#   - uclibc
+#   - uclibc (set ANGSTROM_MODE = "uclibc" in local.conf)
 #   - angstrom-minimal-image-with-mtd-utils bitbake target
 #   - put the following in your local.conf
 #     - IMAGE_FSTYPES = "jffs2 tar cpio.gz"
 # now, when you build the image, a cpio.gz will be generated
 # that can be used as an initramfs.  You can boot into this image and then
 # program the main rootfs jffs2 image in NAND flash using mtd-utils
+# you can select booting the initramfs, or the main nand rootfs by using
+# the "ramdisk on", or "ramdisk off" commands in the bootloader
+#
 
 
diff --git a/packages/linux/compulab-pxa270-2.6.22/defconfig b/packages/linux/compulab-pxa270-2.6.22/defconfig
index a6966d2dad..63bc69533f 100644
--- a/packages/linux/compulab-pxa270-2.6.22/defconfig
+++ b/packages/linux/compulab-pxa270-2.6.22/defconfig
@@ -220,7 +220,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data)"
+CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb
index 963a8cf39f..86a7626d8a 100644
--- a/packages/linux/compulab-pxa270_2.6.22.bb
+++ b/packages/linux/compulab-pxa270_2.6.22.bb
@@ -3,7 +3,7 @@ require linux.inc
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	file://0001-cm-x270-base2.patch;patch=1 \
@@ -30,6 +30,8 @@ S = "${WORKDIR}/linux-${PV}"
 COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "compulab-pxa270"
 
+CMDLINE = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
+
 inherit kernel
 inherit package
 
diff --git a/packages/pango/pango-directfb_1.18.1.bb b/packages/pango/pango-directfb_1.18.1.bb
deleted file mode 100644
index 7e5c798221..0000000000
--- a/packages/pango/pango-directfb_1.18.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require pango.inc
-RCONFLICTS = "pango"
-RPROVIDES = "pango-directfb"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc cairo-directfb"
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
-
-S = "${WORKDIR}/pango-${PV}"
-RRECOMMENDS_${PN} = "" 
-FILESPATH = "${FILE_DIRNAME}/pango-${PV}:${FILE_DIRNAME}/files"