meta-digi-dey: ccardimx28: use standard serial port for console

In ccardimx28 depending on the kernel version the console is on 'ttyAM0'
or 'ttyAMA0'. Use the standard serial port name ttyS0 for login (through
inittab) and let the device handlers create the symlink to the correct
device.

This allows to boot the same rootfs regardless of the kernel version.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-10-04 13:57:32 +02:00
parent 684c6ea6e9
commit c33540030b
3 changed files with 12 additions and 8 deletions

View File

@ -5,8 +5,10 @@
include conf/machine/include/ccardimx28.inc include conf/machine/include/ccardimx28.inc
DTSNAME = "imx28-${MACHINE}" DTSNAME = "imx28-${MACHINE}"
SERIAL_CONSOLE_DEVICE = "${@base_conditional('IS_KERNEL_2X', '1' , 'ttyAM0', 'ttyAMA0', d)}"
SERIAL_CONSOLE = "115200 ${SERIAL_CONSOLE_DEVICE}" # Use standard serial port name and let device handlers (mdev, udev)
# create a symlink to the correct device.
SERIAL_CONSOLE = "115200 ttyS0"
# Use our wmiconfig instead of the one in meta-oe # Use our wmiconfig instead of the one in meta-oe
PREFERRED_VERSION_wmiconfig ?= "3.4p4" PREFERRED_VERSION_wmiconfig ?= "3.4p4"

View File

@ -6,12 +6,10 @@ mmcblk[0-9]+p[0-9]+ 0:0 0660 */lib/mdev/mmc
ttyNS([0-9]) 0:0 0660 >ttyS%1 ttyNS([0-9]) 0:0 0660 >ttyS%1
ttySAC([0-9]) 0:0 0660 >ttyS%1 ttySAC([0-9]) 0:0 0660 >ttyS%1
ttymxc([0-9]) 0:0 0660 >ttyS%1 ttymxc([0-9]) 0:0 0660 >ttyS%1
ttyAM0 0:0 0660 >ttyS0 ttyAMA?0 0:0 0660 @ln -s ${MDEV} ttyS0
ttyAMA0 0:0 0660 >ttyS0 tty(SP|APP)0 0:0 0660 @ln -s ${MDEV} ttyBt
ttySP0 0:0 0660 >ttyBt ttyAPP([1-9]) 0:0 0660 @ln -s ${MDEV} ${MDEV/APP/S}
ttySP([1-9]) 0:0 0660 >ttyS%1 ttySP([1-9]) 0:0 0660 @ln -s ${MDEV} ${MDEV/SP/S}
ttyAPP0 0:0 0660 >ttyBt
ttyAPP([1-9]) 0:0 0660 >ttyS%1
# old Samsung serial port name (for backwards compatibility) # old Samsung serial port name (for backwards compatibility)
s3c2410_serial([0-9]) 0:0 0660 >ttyS%1 s3c2410_serial([0-9]) 0:0 0660 >ttyS%1

View File

@ -22,5 +22,9 @@ KERNEL=="fb2", MODE="0666"
KERNEL=="mxc_vpu", MODE="0666" KERNEL=="mxc_vpu", MODE="0666"
SUBSYSTEM=="video", MODE="0666" SUBSYSTEM=="video", MODE="0666"
KERNEL=="gsl_kmod", MODE="0666" KERNEL=="gsl_kmod", MODE="0666"
# MXS serial port rules
KERNEL=="ttyAM0", MODE="0660", SYMLINK+="ttyS0"
KERNEL=="ttyAMA0", MODE="0660", SYMLINK+="ttyS0"
KERNEL=="ttySP0", MODE="0660", SYMLINK+="ttyBt" KERNEL=="ttySP0", MODE="0660", SYMLINK+="ttyBt"
KERNEL=="ttyAPP0", MODE="0660", SYMLINK+="ttyBt" KERNEL=="ttyAPP0", MODE="0660", SYMLINK+="ttyBt"