svn commit: r270060 - in stable/10/sys: boot/fdt/dts/mips mips/conf

[Bjoern A. Zeeb]

Author: bz
Date: Sat Aug 16 14:21:03 2014
New Revision: 270060
URL: http://svnweb.freebsd.org/changeset/base/270060

Log:
  MFC r263632:
  
   For BERI on NetFPGA assume HZ=100 by default.
  
   Remove the uart support in favour of a "jtag-uart" interface imitation
   providing a much simpler interface, directly exported to the host,
   allowing the toolchain to be shared with BERI on Altera. [1]
  
   Submitted by:	Jong Hun HAN (jong.han cl.cam.ac.uk) [1]
  Sponsored by:	DARPA/AFRL

Modified:
  stable/10/sys/boot/fdt/dts/mips/beri-netfpga.dts
  stable/10/sys/mips/conf/BERI_NETFPGA_MDROOT
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/fdt/dts/mips/beri-netfpga.dts
==============================================================================
--- stable/10/sys/boot/fdt/dts/mips/beri-netfpga.dts	Sat Aug 16 14:17:09 2014	(r270059)
+++ stable/10/sys/boot/fdt/dts/mips/beri-netfpga.dts	Sat Aug 16 14:21:03 2014	(r270060)
@@ -113,6 +113,14 @@
 			soft-interrupt-sources = <64>;
 		};
 
+		serial0: serial at 7f000000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f000000 0x40>;
+			interrupts = <0>;
+			interrupt-parent = <&beripic>;
+		};
+
+/*
 		serial0: serial at 7f002100 {
 			compatible = "ns16550";
 			reg = <0x7f002100 0x20>;
@@ -121,6 +129,7 @@
 			interrupts = <8>;
 			interrupt-parent = <&beripic>;
 		};
+*/
 	};
 
 	aliases { 

Modified: stable/10/sys/mips/conf/BERI_NETFPGA_MDROOT
==============================================================================
--- stable/10/sys/mips/conf/BERI_NETFPGA_MDROOT	Sat Aug 16 14:17:09 2014	(r270059)
+++ stable/10/sys/mips/conf/BERI_NETFPGA_MDROOT	Sat Aug 16 14:21:03 2014	(r270060)
@@ -10,11 +10,14 @@ include "BERI_TEMPLATE"
 
 ident		BERI_NETFPGA_MDROOT
 
+options 	HZ=100
+
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=beri-netfpga.dts
 
-device		uart
+#device		uart
+device		altera_jtag_uart
 
 #
 # This kernel configuration uses an embedded memory root file system.