PERFORCE change 208328 for review

Robert Watson rwatson at FreeBSD.org
Wed Mar 21 20:11:11 UTC 2012


http://p4web.freebsd.org/@@208328?ac=10

Change 208328 by rwatson at rwatson_svr_ctsrd_mipsbuild on 2012/03/21 20:10:27

	Rearrange the deckchairs a bit:
	
	- Make BERI and gxemul console "uarts" conditionally compiled using
	  the FreeBSD kernel config file "device" syntax.
	- Rename uart_gxemul.c to gxmul_uart.c to match reigning conventions
	  in the beri directory.
	- In the default BERI config file, use the Altera JTAG UART.
	- Add a BERI-derived GXEMUL config file that differs only in that it
	  uses the gxemul console driver.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/gxemul_uart.c#1 add
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/uart_gxemul.c#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI#5 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/GXEMUL#1 add

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#5 (text+ko) ====

@@ -1,5 +1,6 @@
 # $FreeBSD$
 mips/beri/beri_machdep.c		standard
-mips/beri/altera_jtag_uart.c		standard
+mips/beri/altera_jtag_uart.c		optional altera_jtag_uart
+mips/beri/gxemul_uart.c			optional gxemul_uart
 mips/mips/intr_machdep.c		standard
 mips/mips/tick.c			standard

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI#5 (text+ko) ====

@@ -42,6 +42,10 @@
 
 options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=8192
+makeoptions	MFS_IMAGE=/tmp/root.img
+options 	ROOTDEVNAME=\"ufs:md0\"
+
+device		altera_jtag_uart
 
 device		md
 device		loop


More information about the p4-projects mailing list