From a92c73e17cb262e30eff6fb27b44ca5893d7b5e0 Mon Sep 17 00:00:00 2001 From: bz Date: Sat, 16 Aug 2014 14:21:03 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@270060 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/boot/fdt/dts/mips/beri-netfpga.dts | 9 +++++++++ sys/mips/conf/BERI_NETFPGA_MDROOT | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/boot/fdt/dts/mips/beri-netfpga.dts b/sys/boot/fdt/dts/mips/beri-netfpga.dts index 3fe8c2d77..509d387c3 100644 --- a/sys/boot/fdt/dts/mips/beri-netfpga.dts +++ b/sys/boot/fdt/dts/mips/beri-netfpga.dts @@ -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 { diff --git a/sys/mips/conf/BERI_NETFPGA_MDROOT b/sys/mips/conf/BERI_NETFPGA_MDROOT index f98389a53..bd7b3a426 100644 --- a/sys/mips/conf/BERI_NETFPGA_MDROOT +++ b/sys/mips/conf/BERI_NETFPGA_MDROOT @@ -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. -- 2.45.0