[oe-commits] org.oe.dev merge of 'd2f47efbbb475855448dcead325ad2439923d6d9'

[pfalcon commit]

merge of 'd2f47efbbb475855448dcead325ad2439923d6d9'
     and 'd7d3b38b67a8d342bd29e546556fc4cc0b2476f8'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 907b09122e18d1c5bf7d911edc9c19d8eff6cfe4
ViewMTN: http://monotone.openembedded.org/revision/info/907b09122e18d1c5bf7d911edc9c19d8eff6cfe4
Files:
1
packages/pango/pango-directfb_1.18.1.bb
conf/machine/compulab-pxa270.conf
packages/linux/compulab-pxa270-2.6.22/defconfig
packages/linux/compulab-pxa270_2.6.22.bb
conf/machine/htcblueangel.conf
Diffs:

#
# mt diff -rd2f47efbbb475855448dcead325ad2439923d6d9 -r907b09122e18d1c5bf7d911edc9c19d8eff6cfe4
#
# 
# 
# delete "packages/pango/pango-directfb_1.18.1.bb"
# 
# patch "conf/machine/compulab-pxa270.conf"
#  from [2b6427127e8dd3428e4576ac92776a4611ca17e1]
#    to [030387a4a7a870fe4a02783a30be65b1b9752695]
# 
# patch "packages/linux/compulab-pxa270-2.6.22/defconfig"
#  from [87c545a5fb4f2c2976b5f4175fcca0b11e143451]
#    to [d155fb708abb99c0c5650a59a1ab6918302581a6]
# 
# patch "packages/linux/compulab-pxa270_2.6.22.bb"
#  from [df4b5445b95e8ba276c920db74be7401fe8d3de9]
#    to [972387e153cfc5285e3c718e97c02bad8279ecb7]
# 
============================================================
--- conf/machine/compulab-pxa270.conf	2b6427127e8dd3428e4576ac92776a4611ca17e1
+++ conf/machine/compulab-pxa270.conf	030387a4a7a870fe4a02783a30be65b1b9752695
@@ -11,19 +11,27 @@ require conf/machine/include/tune-xscale
 
 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 usbh
 # 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
+#
 
 
============================================================
--- packages/linux/compulab-pxa270-2.6.22/defconfig	87c545a5fb4f2c2976b5f4175fcca0b11e143451
+++ packages/linux/compulab-pxa270-2.6.22/defconfig	d155fb708abb99c0c5650a59a1ab6918302581a6
@@ -220,7 +220,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 #
 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
 
============================================================
--- packages/linux/compulab-pxa270_2.6.22.bb	df4b5445b95e8ba276c920db74be7401fe8d3de9
+++ packages/linux/compulab-pxa270_2.6.22.bb	972387e153cfc5285e3c718e97c02bad8279ecb7
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 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 @@ COMPATIBLE_MACHINE = "compulab-pxa270"
 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
 


#
# mt diff -rd7d3b38b67a8d342bd29e546556fc4cc0b2476f8 -r907b09122e18d1c5bf7d911edc9c19d8eff6cfe4
#
# 
# 
# patch "conf/machine/htcblueangel.conf"
#  from [e65ecf996a1d84af3f34a86f70afe617dec9e302]
#    to [0c19233d7062948ae1fec57ba52f8627716d1dd2]
# 
============================================================
--- conf/machine/htcblueangel.conf	e65ecf996a1d84af3f34a86f70afe617dec9e302
+++ conf/machine/htcblueangel.conf	0c19233d7062948ae1fec57ba52f8627716d1dd2
@@ -21,7 +21,6 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"