From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:49:00 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD916960; Sun, 30 Dec 2012 20:49:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E52395E for ; Sun, 30 Dec 2012 20:49:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 495E58FC12 for ; Sun, 30 Dec 2012 20:49:00 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBUKn03L007903 for ; Sun, 30 Dec 2012 20:49:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBUKn0Wj007900 for perforce@freebsd.org; Sun, 30 Dec 2012 20:49:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 30 Dec 2012 20:49:00 GMT Message-Id: <201212302049.qBUKn0Wj007900@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219923 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: Sun, 30 Dec 2012 20:49:01 -0000 http://p4web.freebsd.org/@@219923?ac=10 Change 219923 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2012/12/30 20:48:15 Revert to using hints for all devices except for DE4LED for now, as FDT details are shaken out. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4_MDROOT#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#4 (text+ko) ==== @@ -56,12 +56,14 @@ #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; + ranges = <>; memory { device_type = "memory"; reg = <0x0 0x40000000>; // 1G at 0x0 }; +/* serial@7f000000 { compatible = "altera,jtag_uart-11_0"; reg = <0x7f000000 0x40>; @@ -82,12 +84,14 @@ compatible = "altera,sdcard_11_2011"; reg = <0x7f008000 0x400>; }; +*/ led@7f006000 { compatible = "cambridge,de4led"; reg = <0x7f006000 0x1>; }; +/* ethernet@7f007000 { compatible = "altera,atse"; reg = <0x7f007000 0x540>; @@ -109,5 +113,6 @@ compatible = "intel,strataflash"; reg = <0x76000000 0x2000000>; }; +*/ }; }; ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#2 (text+ko) ==== @@ -27,10 +27,10 @@ # # 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" +#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 ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4_MDROOT#3 (text+ko) ==== @@ -10,6 +10,8 @@ ident BERI_FDT_DE4_MDROOT +hints "BERI_FDT_DE4.hints" #Default places to look for devices. + options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=beripad-de4.dts @@ -21,6 +23,7 @@ options MD_ROOT # MD is a potential root device options MD_ROOT_SIZE=8192 options ROOTDEVNAME=\"ufs:md0\" +makeoptions MFS_IMAGE=/home/rwatson/mdroot.img device altera_avgen device altera_jtag_uart