Author: ian
Date: Sun Oct 20 21:03:15 2013
New Revision: 256804
URL: http://svnweb.freebsd.org/changeset/base/256804

Log:
  Switch to using the standard uart console driver instead of the special
  driver for early boot debugging.

Modified:
  head/sys/arm/freescale/imx/files.imx53
  head/sys/boot/fdt/dts/digi-ccwmx53.dts

Modified: head/sys/arm/freescale/imx/files.imx53
==============================================================================
--- head/sys/arm/freescale/imx/files.imx53      Sun Oct 20 20:52:07 2013        
(r256803)
+++ head/sys/arm/freescale/imx/files.imx53      Sun Oct 20 21:03:15 2013        
(r256804)
@@ -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: head/sys/boot/fdt/dts/digi-ccwmx53.dts
==============================================================================
--- head/sys/boot/fdt/dts/digi-ccwmx53.dts      Sun Oct 20 20:52:07 2013        
(r256803)
+++ head/sys/boot/fdt/dts/digi-ccwmx53.dts      Sun Oct 20 21:03:15 2013        
(r256804)
@@ -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"

Reply via email to