From: Richard Purdie Date: Thu, 14 Feb 2008 21:11:21 +0000 (+0000) Subject: cm-x270.conf: Remove touchscreen from machine features list. Default to the W model... X-Git-Tag: 2011-1~9631 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0578c881f30be20dc103a96efbdae9e61ba9ff39;p=openembedded-core.git cm-x270.conf: Remove touchscreen from machine features list. Default to the W model, not L git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3807 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- diff --git a/meta/conf/machine/cm-x270.conf b/meta/conf/machine/cm-x270.conf index 1b6188753e..226942de73 100644 --- a/meta/conf/machine/cm-x270.conf +++ b/meta/conf/machine/cm-x270.conf @@ -12,10 +12,12 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" 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 +# Console serial port. +# If you have a W module, add the following line to your local.conf: # the following line to your local.conf: -# CMX270_CONSOLE_SERIAL_PORT = "ttyS0" +CMX270_CONSOLE_SERIAL_PORT ?= "ttyS0" +# the following is for the cm-x270 L module +#CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1" # NAND flash eraseblock size # most of the older cm-x270 modules are populated with NAND flash @@ -24,8 +26,6 @@ require conf/machine/include/tune-xscale.inc # can be overridden in local.conf if you have one of these devices. CMX270_NAND_ERASEBLOCK_SIZE ?= "0x20000" -# 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 @@ -48,7 +48,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${CMX270_NAND_ERASEBLOCK_SI ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \ " -MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa iwmmxt" +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia alsa iwmmxt" # 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: