From owner-p4-projects@FreeBSD.ORG Fri Apr 26 19:36:38 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5FF0FDE; Fri, 26 Apr 2013 19:36:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 83562FDC for ; Fri, 26 Apr 2013 19:36:38 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5A3B41AC5 for ; Fri, 26 Apr 2013 19:36:38 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QJabue073325 for ; Fri, 26 Apr 2013 19:36:37 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3QJabDN073322 for perforce@freebsd.org; Fri, 26 Apr 2013 19:36:37 GMT (envelope-from brooks@freebsd.org) Date: Fri, 26 Apr 2013 19:36:37 GMT Message-Id: <201304261936.r3QJabDN073322@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 228122 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 19:36:39 -0000 http://p4web.freebsd.org/@@228122?ac=10 Change 228122 by brooks@brooks_zenith on 2013/04/26 19:36:22 Add the OpenCores 16550 compatible UART to the DE4 confiuration. Not yet configured as a console. Due to the requirement that tty names be unique, rename the Altera JTAG UART devices to ttyj# and update /etc/ttys accordingly. Affected files ... .. //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#23 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#9 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#6 (text+ko) ==== @@ -42,6 +42,10 @@ # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty std.115200" xterm on secure -ttyu1 "/usr/libexec/getty std.115200" xterm on secure -ttyu2 "/usr/libexec/getty std.115200" xterm on secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure ttyu3 "/usr/libexec/getty std.115200" dialup off secure +# Altera JTAG UART +ttyj0 "/usr/libexec/getty std.115200" xterm on secure +ttyj1 "/usr/libexec/getty std.115200" xterm on secure +ttyj2 "/usr/libexec/getty std.115200" xterm on secure ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#23 (text+ko) ==== @@ -91,16 +91,14 @@ */ } -/* - serial0x3f002100 { + serial@7f002100 { compatible = "ns16550"; - reg = <0x3f002100 0x20>; + reg = <0x7f002100 0x20>; reg-shift = <2>; - clock-frequency = <0>; - /* interrupts = <33>; */ - /* interrupt-parent = <&beripic>; */ + clock-frequency = <50000000>; + interrupts = <6>; + interrupt-parent = <&beripic>; }; -*/ serial@7f000000 { compatible = "altera,jtag_uart-11_0"; @@ -208,7 +206,7 @@ compatible = "philips,isp1761"; reg = <0x7f100000 0x40000 0x7f140000 0x4>; - /* IRQ 4 is DC, IRQ 5 is HC. */ + // IRQ 4 is DC, IRQ 5 is HC. interrupts = <4 5>; interrupt-parent = <&beripic>; }; ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#9 (text+ko) ==== @@ -75,7 +75,7 @@ u_int *ajus_jtag_missedp; }; -#define AJU_TTYNAME "ttyu" +#define AJU_TTYNAME "ttyj" /* * Flag values for ajus_flags. ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#6 (text+ko) ==== @@ -34,6 +34,8 @@ options CFI_SUPPORT_STRATAFLASH device sc +device uart + device miibus options DEVICE_POLLING