[oe-commits] org.oe.dev compulab-pxa270-2.6.22: fix kernel command line, add support for W module

[cbrake commit]

compulab-pxa270-2.6.22: fix kernel command line, add support for W module

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 8915c66257098f0ab7ea6664fbdff0a6045c0cfb
ViewMTN: http://monotone.openembedded.org/revision/info/8915c66257098f0ab7ea6664fbdff0a6045c0cfb
Files:
1
conf/machine/compulab-pxa270.conf
packages/linux/compulab-pxa270-2.6.22/defconfig
packages/linux/compulab-pxa270_2.6.22.bb
Diffs:

#
# mt diff -rd3708753e7fc9a994a870df35c048755f116229d -r8915c66257098f0ab7ea6664fbdff0a6045c0cfb
#
# 
# 
# patch "conf/machine/compulab-pxa270.conf"
#  from [1cd85da1e47811640196327bb1fbf2a10570719d]
#    to [d0b2bdcee6336807789b64884c493d4acaa001b9]
# 
# patch "packages/linux/compulab-pxa270-2.6.22/defconfig"
#  from [87c545a5fb4f2c2976b5f4175fcca0b11e143451]
#    to [037354620ee5de504af2f39ec87ae79ad9fa9ed2]
# 
# patch "packages/linux/compulab-pxa270_2.6.22.bb"
#  from [df4b5445b95e8ba276c920db74be7401fe8d3de9]
#    to [8f823d59a8117e729491647c974718decdea1d69]
# 
============================================================
--- conf/machine/compulab-pxa270.conf	1cd85da1e47811640196327bb1fbf2a10570719d
+++ conf/machine/compulab-pxa270.conf	d0b2bdcee6336807789b64884c493d4acaa001b9
@@ -11,13 +11,21 @@ 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"
@@ -37,7 +45,7 @@ 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"
============================================================
--- packages/linux/compulab-pxa270-2.6.22/defconfig	87c545a5fb4f2c2976b5f4175fcca0b11e143451
+++ packages/linux/compulab-pxa270-2.6.22/defconfig	037354620ee5de504af2f39ec87ae79ad9fa9ed2
@@ -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"
 # 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	8f823d59a8117e729491647c974718decdea1d69
@@ -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"
+
 inherit kernel
 inherit package