Add console definition in machine file

Eric Lee
1 parent ed728b4bcb
Showing 10 changed files with 111 additions and 1 deletions Side-by-side Diff
conf/machine/imx6q1gsmarc.conf
conf/machine/imx6q2gsmarc.conf
conf/machine/imx6qp1gsmarc.conf
conf/machine/imx6qp2gsmarc.conf
conf/machine/imx6solosmarc.conf
conf/machine/imx6u1gsmarc.conf
recipes-core/sysvinit/sysvinit-inittab/imxgpu2d/rc_gpu.S
recipes-core/sysvinit/sysvinit-inittab/imxgpu2d/rc_mxc.S
recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
recipes-kernel/linux/linux-smarcfimx6_4.9.88.bb
@@ -9,6 +9,8 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
  
+SERIAL_CONSOLE = "115200 ttymxc4"
+
 MACHINE_FEATURES += " screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost optee"
  
 # Use linux kernel SMARC-FiMX6
@@ -9,6 +9,8 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
  
+SERIAL_CONSOLE = "115200 ttymxc4"
+
 MACHINE_FEATURES += " screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost optee"
  
 # Use linux kernel SMARC-FiMX6
@@ -9,6 +9,8 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
  
+SERIAL_CONSOLE = "115200 ttymxc4"
+
 MACHINE_FEATURES += " screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost optee"
  
 # Use linux kernel SMARC-FiMX6
@@ -9,6 +9,8 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
  
+SERIAL_CONSOLE = "115200 ttymxc4"
+
 MACHINE_FEATURES += " screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost optee"
  
 # Use linux kernel SMARC-FiMX6
@@ -9,6 +9,8 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
  
+SERIAL_CONSOLE = "115200 ttymxc4"
+
 MACHINE_FEATURES += " screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost optee"
  
 # Use linux kernel SMARC-FiMX6
@@ -9,6 +9,8 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
  
+SERIAL_CONSOLE = "115200 ttymxc4"
+
 MACHINE_FEATURES += " screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost optee"
  
 # Use linux kernel SMARC-FiMX6
+#!/bin/bash
+CPUREV=$(cat /sys/devices/soc0/soc_id)
+FILEVG=/usr/lib/libOpenVG.so
+FILEVG3D=/usr/lib/libOpenVG.3d.so
+FILEVG355=/usr/lib/libOpenVG.2d.so
+if  [ -e $FILEVG3D ] && [ -e $FILEVG355 ]
+then
+  if [ -e  $FILEVG ]
+  then
+        rm -f $FILEVG
+  fi
+  if [ $CPUREV == "i.MX6QP" ] || [ $CPUREV == "i.MX6Q" ] || [ $CPUREV == "i.MX6SL" ]
+  then
+        # Use GC355 VG
+        ln -s $FILEVG355 $FILEVG
+  else
+        ln -s $FILEVG3D $FILEVG
+  fi
+fi
+#!/bin/bash
+#
+if grep -sq ttymxc0 /proc/cmdline; then
+	/sbin/getty -L ttymxc0 115200 vt100
+elif grep -sq ttymxc1 /proc/cmdline; then
+	/sbin/getty -L ttymxc1 115200 vt100
+elif grep -sq ttymxc3 /proc/cmdline; then
+	/sbin/getty -L ttymxc3 115200 vt100
+elif grep -sq ttymxc4 /proc/cmdline; then
+	/sbin/getty -L ttymxc4 115200 vt100
+elif grep -sq ttyLP0 /proc/cmdline; then
+	/sbin/getty -L ttyLP0 115200 vt100
+elif grep -sq ttyLP1 /proc/cmdline; then
+	/sbin/getty -L ttyLP1 115200 vt100
+elif grep -sq ttyLP2 /proc/cmdline; then
+	/sbin/getty -L ttyLP2 115200 vt100
+elif grep -sq ttyLP3 /proc/cmdline; then
+	/sbin/getty -L ttyLP3 115200 vt100
+else
+	sleep 100000
+fi
+# Freescale imx extra configuration 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+RDEPENDS_${PN} += " bash "
+
+SYSVINIT-GPU = " file://rc_mxc.S file://rc_gpu.S"
+
+SRC_URI_append_imxgpu2d  = " ${SYSVINIT-GPU}"
+
+do_install_append_imxgpu2d() {
+
+    install -d ${D}${sysconfdir}
+
+    # Install rc_mxc.S to /etc/init.d
+    install -d ${D}${sysconfdir} ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/rc_mxc.S ${D}${sysconfdir}/init.d
+
+    install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
+
+    echo "mxc::respawn:/etc/init.d/rc_mxc.S" >> ${D}${sysconfdir}/inittab
+
+    tmp="${SERIAL_CONSOLES}"
+    for i in $tmp
+    do
+	j=`echo ${i} | sed s/\;/\ /g`
+	label=`echo ${i} | sed -e 's/^.*;tty//'`
+	# comment these lines off
+	echo "#$label:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
+    done
+
+    if [ "${USE_VT}" = "1" ]; then
+        cat <<EOF >>${D}${sysconfdir}/inittab
+# ${base_sbindir}/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+#
+
+EOF
+
+        for n in ${SYSVINIT_ENABLED_GETTYS}
+        do
+            echo "$n:2345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab
+        done
+        echo "" >> ${D}${sysconfdir}/inittab
+    fi
+
+    # Install rc_gpu.S to /etc/init.d
+    echo "gpu::sysinit:/etc/init.d/rc_gpu.S" >> ${D}${sysconfdir}/inittab
+    install -m 0755 ${WORKDIR}/rc_gpu.S ${D}${sysconfdir}/init.d
+}
+
+FILES_${PN}_append_imxgpu2d = " ${sysconfdir}/init.d/rc_mxc.S ${sysconfdir}/init.d/rc_gpu.S"
+
+PACKAGE_ARCH_imxgpu2d = "${MACHINE_ARCH}"
@@ -28,7 +28,7 @@
  
 KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
 SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
-SRCREV = "8feef65c1cb8a1699f4bc5d42f569b838e8f7d23"
+SRCREV = "4b3fe740490221fc48c7f424a1e2e213b4874727"
  
 S = "${WORKDIR}/git"
...	...	@@ -9,6 +9,8 @@
9	9	require conf/machine/include/imx-base.inc
10	10	require conf/machine/include/tune-cortexa9.inc
11	11
	12	+SERIAL_CONSOLE = "115200 ttymxc4"
	13	+
12	14	MACHINE_FEATURES += " screen usbgadget vfat ext2 bluetooth wifi pci alsa serial usbhost optee"
13	15
14	16	# Use linux kernel SMARC-FiMX6
	1	+#!/bin/bash
	2	+CPUREV=$(cat /sys/devices/soc0/soc_id)
	3	+FILEVG=/usr/lib/libOpenVG.so
	4	+FILEVG3D=/usr/lib/libOpenVG.3d.so
	5	+FILEVG355=/usr/lib/libOpenVG.2d.so
	6	+if [ -e $FILEVG3D ] && [ -e $FILEVG355 ]
	7	+then
	8	+ if [ -e $FILEVG ]
	9	+ then
	10	+ rm -f $FILEVG
	11	+ fi
	12	+ if [ $CPUREV == "i.MX6QP" ] \|\| [ $CPUREV == "i.MX6Q" ] \|\| [ $CPUREV == "i.MX6SL" ]
	13	+ then
	14	+ # Use GC355 VG
	15	+ ln -s $FILEVG355 $FILEVG
	16	+ else
	17	+ ln -s $FILEVG3D $FILEVG
	18	+ fi
	19	+fi
	1	+#!/bin/bash
	2	+#
	3	+if grep -sq ttymxc0 /proc/cmdline; then
	4	+ /sbin/getty -L ttymxc0 115200 vt100
	5	+elif grep -sq ttymxc1 /proc/cmdline; then
	6	+ /sbin/getty -L ttymxc1 115200 vt100
	7	+elif grep -sq ttymxc3 /proc/cmdline; then
	8	+ /sbin/getty -L ttymxc3 115200 vt100
	9	+elif grep -sq ttymxc4 /proc/cmdline; then
	10	+ /sbin/getty -L ttymxc4 115200 vt100
	11	+elif grep -sq ttyLP0 /proc/cmdline; then
	12	+ /sbin/getty -L ttyLP0 115200 vt100
	13	+elif grep -sq ttyLP1 /proc/cmdline; then
	14	+ /sbin/getty -L ttyLP1 115200 vt100
	15	+elif grep -sq ttyLP2 /proc/cmdline; then
	16	+ /sbin/getty -L ttyLP2 115200 vt100
	17	+elif grep -sq ttyLP3 /proc/cmdline; then
	18	+ /sbin/getty -L ttyLP3 115200 vt100
	19	+else
	20	+ sleep 100000
	21	+fi
	1	+# Freescale imx extra configuration
	2	+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
	3	+
	4	+RDEPENDS_${PN} += " bash "
	5	+
	6	+SYSVINIT-GPU = " file://rc_mxc.S file://rc_gpu.S"
	7	+
	8	+SRC_URI_append_imxgpu2d = " ${SYSVINIT-GPU}"
	9	+
	10	+do_install_append_imxgpu2d() {
	11	+
	12	+ install -d ${D}${sysconfdir}
	13	+
	14	+ # Install rc_mxc.S to /etc/init.d
	15	+ install -d ${D}${sysconfdir} ${D}${sysconfdir}/init.d
	16	+ install -m 0755 ${WORKDIR}/rc_mxc.S ${D}${sysconfdir}/init.d
	17	+
	18	+ install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
	19	+
	20	+ echo "mxc::respawn:/etc/init.d/rc_mxc.S" >> ${D}${sysconfdir}/inittab
	21	+
	22	+ tmp="${SERIAL_CONSOLES}"
	23	+ for i in $tmp
	24	+ do
	25	+ j=`echo ${i} \| sed s/\;/\ /g`
	26	+ label=`echo ${i} \| sed -e 's/^.*;tty//'`
	27	+ # comment these lines off
	28	+ echo "#$label:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
	29	+ done
	30	+
	31	+ if [ "${USE_VT}" = "1" ]; then
	32	+ cat <<EOF >>${D}${sysconfdir}/inittab
	33	+# ${base_sbindir}/getty invocations for the runlevels.
	34	+#
	35	+# The "id" field MUST be the same as the last
	36	+# characters of the device (after "tty").
	37	+#
	38	+# Format:
	39	+# <id>:<runlevels>:<action>:<process>
	40	+#
	41	+
	42	+EOF
	43	+
	44	+ for n in ${SYSVINIT_ENABLED_GETTYS}
	45	+ do
	46	+ echo "$n:2345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab
	47	+ done
	48	+ echo "" >> ${D}${sysconfdir}/inittab
	49	+ fi
	50	+
	51	+ # Install rc_gpu.S to /etc/init.d
	52	+ echo "gpu::sysinit:/etc/init.d/rc_gpu.S" >> ${D}${sysconfdir}/inittab
	53	+ install -m 0755 ${WORKDIR}/rc_gpu.S ${D}${sysconfdir}/init.d
	54	+}
	55	+
	56	+FILES_${PN}_append_imxgpu2d = " ${sysconfdir}/init.d/rc_mxc.S ${sysconfdir}/init.d/rc_gpu.S"
	57	+
	58	+PACKAGE_ARCH_imxgpu2d = "${MACHINE_ARCH}"
...	...	@@ -28,7 +28,7 @@
28	28
29	29	KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
30	30	SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
31		-SRCREV = "8feef65c1cb8a1699f4bc5d42f569b838e8f7d23"
	31	+SRCREV = "4b3fe740490221fc48c7f424a1e2e213b4874727"
32	32
33	33	S = "${WORKDIR}/git"
34	34