Date: Mon, 7 Jan 2013 21:01:41 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219959 for review Message-ID: <201301072101.r07L1fUr053836@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219959?ac=10 Change 219959 by brooks@brooks_zenith on 2013/01/07 21:01:04 Switch BERI_DE4 kernels to FDT retaining hints only for flash partitioning. Reduce duplication in BERI_DE4_[MS]DROOT configurations by splitting general DE4 configuration into BERI_DE4_BASE. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#17 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#1 add .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#10 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#10 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#17 (text+ko) ==== @@ -1,97 +1,5 @@ # $FreeBSD: src/sys/mips/conf/BERI_DE4.hints,v 1.5 2012/08/26 10:40:13 rwatson Exp $ -# -# Altera JTAG UARTs configured for console, debugging, and data putput on the -# Terasic DE-4. -# -hint.altera_jtag_uart.0.at="nexus0" -hint.altera_jtag_uart.0.maddr=0x7f000000 -hint.altera_jtag_uart.0.msize=0x40 -hint.altera_jtag_uart.0.irq=0 - -hint.altera_jtag_uart.1.at="nexus0" -hint.altera_jtag_uart.1.maddr=0x7f001000 -hint.altera_jtag_uart.1.msize=0x40 - -hint.altera_jtag_uart.2.at="nexus0" -hint.altera_jtag_uart.2.maddr=0x7f002000 -hint.altera_jtag_uart.2.msize=0x40 - -# -# On-board DE4 and tPad SD Card IP core -# -hint.altera_sdcardc.0.at="nexus0" -hint.altera_sdcardc.0.maddr=0x7f008000 -hint.altera_sdcardc.0.msize=0x400 - -# -# On-board DE4 8-element LED -# -hint.terasic_de4led.0.at="nexus0" -hint.terasic_de4led.0.maddr=0x7f006000 -hint.terasic_de4led.0.msize=1 -hint.terasic_de4led.0.de4led_0_cmd="f9" - -# -# Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations -# -hint.atse.0.at="nexus0" -hint.atse.0.maddr=0x7f007000 -hint.atse.0.msize=0x540 - -# -# Terasic Multi-touch LCD (MTL), an optional feature in DE-4 configurations. -# -hint.terasic_mtl.0.at="nexus0" -hint.terasic_mtl.0.reg_maddr=0x70400000 -hint.terasic_mtl.0.reg_msize=0x1000 -hint.terasic_mtl.0.pixel_maddr=0x70000000 -hint.terasic_mtl.0.pixel_msize=0x177000 -hint.terasic_mtl.0.text_maddr=0x70177000 -hint.terasic_mtl.0.text_msize=0x2000 - -# -# BERI Hardware Version ROM -# -hint.altera_avgen.0.at="nexus0" -hint.altera_avgen.0.maddr=0x7F00A000 -hint.altera_avgen.0.msize=20 -hint.altera_avgen.0.width=4 -hint.altera_avgen.0.fileio="rw" -hint.altera_avgen.0.devname="berirom" - -# -# Expose the DE4 buttons and switches via an Avalon "generic" device. -# -hint.altera_avgen.1.at="nexus0" -hint.altera_avgen.1.maddr=0x7f009000 -hint.altera_avgen.1.msize=2 -hint.altera_avgen.1.width=1 -hint.altera_avgen.1.fileio="r" -hint.altera_avgen.1.devname="de4bsw" - -# -# Expose the DE4 flash via an Avalon "generic" device. -# This is incompatible with the isf(4) driver. -# -#hint.altera_avgen.2.at="nexus0" -#hint.altera_avgen.2.maddr=0x74000000 -#hint.altera_avgen.2.msize=0x4000000 -#hint.altera_avgen.2.width=2 -#hint.altera_avgen.2.fileio="rw" -#hint.altera_avgen.2.mmapio="rwx" -#hint.altera_avgen.2.devname="de4flash" - -# -# General Intel StrataFlash driver -# -hint.isf.0.at="nexus0" -hint.isf.0.maddr=0x74000000 -hint.isf.0.msize=0x2000000 -hint.isf.1.at="nexus0" -hint.isf.1.maddr=0x76000000 -hint.isf.1.msize=0x2000000 - # Reserved configuration blocks. Don't touch. hint.map.0.at="isf0" hint.map.0.start=0x00000000 @@ -105,13 +13,13 @@ hint.map.1.end=0x01820000 hint.map.1.name="fpga" -# Kernel on first chip +# Currently unused space on the first chip hint.map.2.at="isf0" hint.map.2.start=0x01820000 hint.map.2.end=0x02000000 hint.map.2.name="reserved" -# The second chip +# Kernel on the second chip hint.map.3.at="isf1" hint.map.3.start=0x00000000 hint.map.3.end=0x02000000 ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#10 (text+ko) ==== @@ -1,30 +1,20 @@ # -# BERI_DE4 -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC -# Implementation) FPGA soft core, as configured in its Terasic DE-4 reference -# configuration. +# BERI_DE4_MDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible +# RISC # Implementation) FPGA soft core, as configured in its Terasic DE-4 +# reference configuration. # # $FreeBSD: src/sys/mips/conf/BERI_DE4_MDROOT,v 1.6 2012/09/05 15:55:51 brooks Exp $ # -include "BERI_TEMPLATE" +include "BERI_DE4_BASE" ident BERI_DE4_MDROOT -hints "BERI_DE4.hints" #Default places to look for devices. - # # This kernel configuration uses an embedded 8MB memory root file system. # Adjust the following path based on local requirements. # options MD_ROOT # MD is a potential root device -options MD_ROOT_SIZE=8192 +options MD_ROOT_SIZE=18432 options ROOTDEVNAME=\"ufs:md0\" - -device altera_avgen -device altera_jtag_uart -device altera_sdcard -device terasic_de4led -device terasic_mtl - -device isf -device sc +makeoptions MFS_IMAGE=/home/bed22/demoroot.img ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#10 (text+ko) ==== @@ -1,24 +1,16 @@ # -# BERI_DE4 -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC -# Implementation) FPGA soft core, as configured in its Terasic DE-4 reference -# configuration. +# BERI_DE4_SDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible +# RISC Implementation) FPGA soft core, as configured in its Terasic DE-4 +# reference configuration. # # $FreeBSD: src/sys/mips/conf/BERI_DE4_SDROOT,v 1.5 2012/08/26 09:21:59 rwatson Exp $ # -include "BERI_TEMPLATE" +include "BERI_DE4_BASE" ident BERI_DE4_SDROOT -hints "BERI_DE4.hints" #Default places to look for devices. - +# +# This kernel expects to find its root filesystem on the SD Card. +# options ROOTDEVNAME=\"ufs:altera_sdcard0\" - -device altera_avgen -device altera_jtag_uart -device altera_sdcard -device terasic_de4led -device terasic_mtl - -device isf -device sc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301072101.r07L1fUr053836>