diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
commit | 27067774dce3388702a4cf744d7096c6fb71b688 (patch) | |
tree | 56300949abd050b3cd2e23d29210d2a567bc8aec /sys/riscv/conf/QEMU | |
parent | 44be0a8ea517cbe7a9140bca20e1e93228ac0a04 (diff) | |
parent | 915a263ea24ab051bb57674a4d6f5ffe4ef0d5b5 (diff) |
Merge ^/head r303250 through r304235.
Notes
Notes:
svn path=/projects/clang390-import/; revision=304236
Diffstat (limited to 'sys/riscv/conf/QEMU')
-rw-r--r-- | sys/riscv/conf/QEMU | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/riscv/conf/QEMU b/sys/riscv/conf/QEMU index 26c65430844f..7411aefc6b1d 100644 --- a/sys/riscv/conf/QEMU +++ b/sys/riscv/conf/QEMU @@ -21,8 +21,8 @@ include GENERIC ident QEMU -device htif -options ROOTDEVNAME=\"ufs:/dev/htif_blk0\" +device rcons +options ROOTDEVNAME=\"ufs:/dev/md0\" # RISCVTODO: This needs to be done via loader (when it's available). options FDT_DTB_STATIC |