Author: ian
Date: Fri Dec 13 17:10:23 2013
New Revision: 259315
URL: http://svnweb.freebsd.org/changeset/base/259315
Log:
MFC r256804:
Switch to using the standard uart console driver instead of the special
driver for early boot debugging.
Modified:
stable/10/sys/arm/freescale/imx/files.imx53
stable/10/sys/boot/fdt/dts/digi-ccwmx53.dts
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/freescale/imx/files.imx53
==============================================================================
--- stable/10/sys/arm/freescale/imx/files.imx53 Fri Dec 13 17:03:32 2013
(r259314)
+++ stable/10/sys/arm/freescale/imx/files.imx53 Fri Dec 13 17:10:23 2013
(r259315)
@@ -12,8 +12,11 @@ arm/freescale/imx/imx53_machdep.c standa
arm/freescale/imx/common.c standard
arm/freescale/imx/bus_space.c standard
-# Dummy serial console
-arm/freescale/imx/console.c standard
+# Special serial console for debuging early boot code
+#arm/freescale/imx/console.c standard
+
+# UART driver (includes serial console support)
+dev/uart/uart_dev_imx.c optional uart
# TrustZone Interrupt Controller
arm/freescale/imx/tzic.c standard
@@ -33,9 +36,6 @@ arm/freescale/imx/imx51_ccm.c standard
# i.MX5xx PATA controller
dev/ata/chipsets/ata-fsl.c optional imxata
-# UART driver
-#dev/uart/uart_dev_imx.c optional uart
-
# USB join controller (1 OTG, 3 EHCI)
dev/usb/controller/ehci_imx.c optional ehci
Modified: stable/10/sys/boot/fdt/dts/digi-ccwmx53.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/digi-ccwmx53.dts Fri Dec 13 17:03:32 2013
(r259314)
+++ stable/10/sys/boot/fdt/dts/digi-ccwmx53.dts Fri Dec 13 17:10:23 2013
(r259315)
@@ -70,9 +70,9 @@
};
/* UART1, console */
- UART1: serial@53fbc000 {
+ console: serial@53fbc000 {
status = "okay";
- clock-frequency = <3000000>; /* XXX */
+ clock-frequency = <0>; /* won't load w/o this */
};
clock@53fd4000 {
@@ -111,13 +111,12 @@
};
aliases {
- UART1 = &UART1;
SSI2 = &SSI2;
};
chosen {
bootargs = "-v";
- stdin = "UART1";
- stdout = "UART1";
+ stdin = &console;
+ stdout = &console;
};
};
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
