Date: Sat, 22 Mar 2014 13:06:33 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> 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 Message-ID: <201403221306.s2MD6XrG013082@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403221306.s2MD6XrG013082>