summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2014-03-22 13:06:32 +0000
committerbz <bz@FreeBSD.org>2014-03-22 13:06:32 +0000
commit260ba47599729a7cb2f104c437c909e8109aa2d2 (patch)
tree7fb69f71e51c3eb12815254713cc5d238b934626
parent3bc7f167e052261843a975e4e487fa9da3647a87 (diff)
downloadFreeBSD-src-260ba47599729a7cb2f104c437c909e8109aa2d2.zip
FreeBSD-src-260ba47599729a7cb2f104c437c909e8109aa2d2.tar.gz
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
-rw-r--r--sys/boot/fdt/dts/mips/beri-netfpga.dts9
-rw-r--r--sys/mips/conf/BERI_NETFPGA_MDROOT5
2 files changed, 13 insertions, 1 deletions
diff --git a/sys/boot/fdt/dts/mips/beri-netfpga.dts b/sys/boot/fdt/dts/mips/beri-netfpga.dts
index 3fe8c2d..509d387 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 f98389a..bd7b3a4 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.
OpenPOWER on IntegriCloud