mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-04-20 19:53:43 +00:00
Code Issues Projects Releases Wiki Activity

conf/machine: simplify console settings, deprecate ttyO use

Browse Source 
Now, that 4.9 finally switched from ttyO to ttyS and all issues were addressed,
no need to try all possible combinations in most cases.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
Denys Dmytriyenko
2017-03-03 05:43:58 +00:00
parent 90e1676ffc
commit 24b24a50cd
14 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/machine/am335x-evm.conf
View File

@@ -11,8 +11,9 @@ MACHINE_FEATURES += "touchscreen"
IMAGE_FSTYPES += "ubifs ubi tar.xz"
# Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0 115200;ttyS3 115200;ttyO3"
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
# UBI information. Note that this is board and kernel specific. Changes

2
conf/machine/am3517-evm.conf
View File

@@ -12,7 +12,7 @@ MACHINE_FEATURES += "touchscreen ethernet"
IMAGE_FSTYPES += "ubi tar.gz"
EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
SERIAL_CONSOLE = "115200 ttyO2"
SERIAL_CONSOLE = "115200 ttyS2"
USE_VT = "2"
KERNEL_DEVICETREE = "am3517-evm.dtb"

2
conf/machine/am37x-evm.conf
View File

@@ -14,7 +14,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"
SERIAL_CONSOLE = "115200 ttyO0"
SERIAL_CONSOLE = "115200 ttyS0"
# NOTE: there are NAND and OneNAND versions of this board...
# do ubiattach /dev/ubi_ctrl -m 4

4
conf/machine/am437x-evm.conf
View File

@@ -11,9 +11,7 @@ MACHINE_FEATURES += "touchscreen"
IMAGE_FSTYPES += "ubifs ubi tar.xz"
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
SERIAL_CONSOLE = "115200 ttyS0"
# UBI information. Note that this is board and kernel specific. Changes
# in your kernel port may require changes in these variables. For more

4
conf/machine/am57xx-evm.conf
View File

@@ -8,9 +8,7 @@ MACHINE_FEATURES += "touchscreen"
IMAGE_FSTYPES += "tar.xz"
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS2 115200;ttyO2"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
SERIAL_CONSOLE = "115200 ttyS2"
KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb \
am57xx-evm.dtb am57xx-evm-reva3.dtb \

2
conf/machine/beagleboard.conf
View File

@@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp"
KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"
SERIAL_CONSOLE = "115200 ttyO2"
SERIAL_CONSOLE = "115200 ttyS2"
UBOOT_MACHINE = "omap3_beagle_config"

2
conf/machine/beaglebone.conf
View File

@@ -12,6 +12,6 @@ MACHINE_GUI_CLASS = "bigscreen"
IMAGE_FSTYPES += "tar.gz"
SERIAL_CONSOLE = "115200 ttyO0"
SERIAL_CONSOLE = "115200 ttyS0"
UBOOT_MACHINE = "am335x_boneblack_config"

4
conf/machine/dra7xx-evm.conf
View File

@@ -8,9 +8,7 @@ MACHINE_FEATURES += "touchscreen"
IMAGE_FSTYPES += "tar.xz"
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
SERIAL_CONSOLE = "115200 ttyS0"
KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \
dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \

4
conf/machine/k2e-evm.conf
View File

@@ -12,9 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2e"
IMAGE_FSTYPES += "ubifs ubi tar.xz"
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
SERIAL_CONSOLE = "115200 ttyS0"
SYSVINIT_ENABLED_GETTYS = ""

4
conf/machine/k2g-evm.conf
View File

@@ -14,9 +14,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2g"
IMAGE_FSTYPES += "ubifs ubi tar.xz"
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
SERIAL_CONSOLE = "115200 ttyS0"
SYSVINIT_ENABLED_GETTYS = ""

4
conf/machine/k2hk-evm.conf
View File

@@ -12,9 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2hk"
IMAGE_FSTYPES += "ubifs ubi tar.xz"
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
SERIAL_CONSOLE = "115200 ttyS0"
SYSVINIT_ENABLED_GETTYS = ""

4
conf/machine/k2l-evm.conf
View File

@@ -12,9 +12,7 @@ BOOT_MONITOR_MAKE_TARGET = "k2l"
IMAGE_FSTYPES += "ubifs ubi tar.xz"
SERIAL_CONSOLE = ""
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
SERIAL_CONSOLE = "115200 ttyS0"
SYSVINIT_ENABLED_GETTYS = ""

2
conf/machine/omap5-evm.conf
View File

@@ -8,7 +8,7 @@ IMAGE_FSTYPES += "ubi tar.gz"
KERNEL_DEVICETREE = "omap5-uevm.dtb"
SERIAL_CONSOLE = "115200 ttyO2"
SERIAL_CONSOLE = "115200 ttyS2"
# UBI information. Note that this is board and kernel specific. Changes
# in your kernel port may require changes in these variables. For more

2
conf/machine/pandaboard.conf
View File

@@ -10,7 +10,7 @@ IMAGE_FSTYPES += "tar.gz"
KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"
SERIAL_CONSOLE = "115200 ttyO2"
SERIAL_CONSOLE = "115200 ttyS2"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"