From owner-svn-src-all@FreeBSD.ORG  Sat Mar 22 13:06:33 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 946FB59F;
 Sat, 22 Mar 2014 13:06:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 812CFBCE;
 Sat, 22 Mar 2014 13:06:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2MD6XIL013084;
 Sat, 22 Mar 2014 13:06:33 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2MD6XrG013082;
 Sat, 22 Mar 2014 13:06:33 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201403221306.s2MD6XrG013082@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 22 Mar 2014 13:06:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263632 - in head/sys: boot/fdt/dts/mips mips/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Mar 2014 13:06:33 -0000

Author: bz
Date: Sat Mar 22 13:06:32 2014
New Revision: 263632
URL: http://svnweb.freebsd.org/changeset/base/263632

Log:
  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]
  MFC after:	2 weeks

Modified:
  head/sys/boot/fdt/dts/mips/beri-netfpga.dts
  head/sys/mips/conf/BERI_NETFPGA_MDROOT

Modified: head/sys/boot/fdt/dts/mips/beri-netfpga.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beri-netfpga.dts	Sat Mar 22 12:28:21 2014	(r263631)
+++ head/sys/boot/fdt/dts/mips/beri-netfpga.dts	Sat Mar 22 13:06:32 2014	(r263632)
@@ -113,6 +113,14 @@
 			soft-interrupt-sources = <64>;
 		};
 
+		serial0: serial@7f000000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f000000 0x40>;
+			interrupts = <0>;
+			interrupt-parent = <&beripic>;
+		};
+
+/*
 		serial0: serial@7f002100 {
 			compatible = "ns16550";
 			reg = <0x7f002100 0x20>;
@@ -121,6 +129,7 @@
 			interrupts = <8>;
 			interrupt-parent = <&beripic>;
 		};
+*/
 	};
 
 	aliases { 

Modified: head/sys/mips/conf/BERI_NETFPGA_MDROOT
==============================================================================
--- head/sys/mips/conf/BERI_NETFPGA_MDROOT	Sat Mar 22 12:28:21 2014	(r263631)
+++ head/sys/mips/conf/BERI_NETFPGA_MDROOT	Sat Mar 22 13:06:32 2014	(r263632)
@@ -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.