Date: Wed, 6 Mar 2013 21:49:16 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 222674 for review Message-ID: <201303062149.r26LnG0G065312@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@222674?ac=10 Change 222674 by brooks@brooks_zenith on 2013/03/06 21:48:47 Integrate from BeriBSD at 222673. cfi(4) writes work correctly and add de4ctl. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#11 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd/de4ctl/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/de4ctl/de4ctl.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_core.c#6 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#11 (text+ko) ==== @@ -4,6 +4,7 @@ browser \ cheripoint \ cycle_led \ + de4ctl \ flashit \ libexec \ minifile \ ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#5 (text+ko) ==== @@ -148,5 +148,13 @@ sri-cambridge,fileio = "rw"; sri-cambridge,devname = "berirom"; }; + + avgen@0x7f00c000 { + compatible = "sri-cambridge,avgen"; + reg = <0x7f00c000 0x8>; + sri-cambridge,width = <4>; + sri-cambridge,fileio = "rw"; + sri-cambridge,devname = "de4tempfan"; + }; }; }; ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_core.c#6 (text+ko) ==== @@ -545,13 +545,13 @@ break; } - cfi_write(sc, sc->sc_wrofs, CFI_BCS_CONFIRM); + cfi_write(sc, sc->sc_wrofs + i, + CFI_BCS_CONFIRM); - error = cfi_wait_ready(sc, sc->sc_wrofs + 1, + error = cfi_wait_ready(sc, sc->sc_wrofs + i, &start, CFI_TIMEOUT_BUFWRITE); - - goto out; } + goto out; default: /* Fall through to single word case */ break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303062149.r26LnG0G065312>