mu2pwryse
/
pebstwck3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update README, Travis, Makefile

Browse Source
master
WangRunji 6 years ago
parent 2303a8099b
commit 2766f49986
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File

14
.travis.yml
Unescape View File

@ -4,7 +4,7 @@ dist: xenial
language: rust language: rust
rust: nightly-2019-01-01 rust: nightly-2019-02-15
os: os:
- linux - linux
@ -25,6 +25,7 @@ env:
matrix: matrix:
- ARCH="riscv64" - ARCH="riscv64"
- ARCH="riscv64" OPTS="board=k210" - ARCH="riscv64" OPTS="board=k210"
- ARCH="riscv64" OPTS="board=u540"
- ARCH="riscv32" - ARCH="riscv32"
- ARCH="riscv32" OPTS="m_mode=1" - ARCH="riscv32" OPTS="m_mode=1"
- ARCH="x86_64" - ARCH="x86_64"
@ -32,17 +33,18 @@ env:
install: install:
- if [ $ARCH = riscv32 ] || [ $ARCH = riscv64 ]; then - if [ $ARCH = riscv32 ] || [ $ARCH = riscv64 ]; then
[ $TRAVIS_OS_NAME = linux ] && export FILE="riscv64-unknown-elf-gcc-8.1.0-2018.12.0-x86_64-linux-ubuntu14"; [ $TRAVIS_OS_NAME = linux ] && export FILE="riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14";
[ $TRAVIS_OS_NAME = osx ] && export FILE="riscv64-unknown-elf-gcc-8.1.0-2018.12.0-x86_64-apple-darwin"; [ $TRAVIS_OS_NAME = osx ] && export FILE="riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-apple-darwin";
wget https://static.dev.sifive.com/dev-tools/$FILE.tar.gz; wget https://static.dev.sifive.com/dev-tools/$FILE.tar.gz;
tar xf $FILE.tar.gz; tar xf $FILE.tar.gz;
export PATH=$PATH:$PWD/$FILE/bin; export PATH=$PATH:$PWD/$FILE/bin;
fi fi
- if [ $ARCH = aarch64 ]; then - if [ $ARCH = aarch64 ]; then
if [ $TRAVIS_OS_NAME = linux ]; then if [ $TRAVIS_OS_NAME = linux ]; then
wget https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/gcc-arm-8.2-2018.11-x86_64-aarch64-elf.tar.xz; export FILE="gcc-arm-8.2-2018.11-x86_64-aarch64-elf";
tar -xvf gcc-arm-8.2-2018.11-x86_64-aarch64-elf.tar.xz; wget https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2018.11/$FILE.tar.xz;
export PATH=$PATH:$PWD/gcc-arm-8.2-2018.11-x86_64-aarch64-elf/bin; tar -xvf $FILE.tar.xz;
export PATH=$PATH:$PWD/$FILE/bin;
elif [ $TRAVIS_OS_NAME = osx ]; then elif [ $TRAVIS_OS_NAME = osx ]; then
brew tap SergioBenitez/osxct; brew tap SergioBenitez/osxct;
brew install aarch64-none-elf; brew install aarch64-none-elf;

14
README.md
Unescape View File

@ -1,6 +1,6 @@
# rCore Plus # rCore Plus
[![Build Status](https://travis-ci.org/wangrunji0408/RustOS.svg?branch=master)](https://travis-ci.org/oscourse-tsinghua/RustOS) [![Build Status](https://travis-ci.org/oscourse-tsinghua/rcore_plus.svg?branch=master)](https://travis-ci.org/oscourse-tsinghua/rcore_plus)
Rust version of THU [uCore OS Plus](https://github.com/chyyuu/ucore_os_plus). Rust version of THU [uCore OS Plus](https://github.com/chyyuu/ucore_os_plus).
@ -8,7 +8,7 @@ Its former repo name is https://github.com/oscourse-tsinghua/RustOS .
Going to be the next generation teaching operating system. Going to be the next generation teaching operating system.
Supported architectures: x86_64, RISCV32/64, AArch64， MIPS(future) Supported architectures: x86_64, RISCV32/64, AArch64, MIPS(future)
Tested boards: QEMU, labeled-RISCV, K210, Raspberry Pi 3B+ Tested boards: QEMU, labeled-RISCV, K210, Raspberry Pi 3B+
@ -20,12 +20,14 @@ Tested boards: QEMU, labeled-RISCV, K210, Raspberry Pi 3B+
### Environment ### Environment
* [Rust](https://www.rust-lang.org) toolchain at nightly-2019-01-01 * [Rust](https://www.rust-lang.org) toolchain at nightly-2019-02-15
* Cargo tools: [cargo-xbuild](https://github.com/rust-osdev/cargo-xbuild) * Cargo tools: [cargo-xbuild](https://github.com/rust-osdev/cargo-xbuild)
* [QEMU](https://www.qemu.org) >= 3.1.0 * [QEMU](https://www.qemu.org) >= 3.1.0
* [bootimage](https://github.com/rust-osdev/bootimage) (for x86_64) * [bootimage](https://github.com/rust-osdev/bootimage) (for x86_64)
* [RISCV64 GNU toolchain](https://www.sifive.com/boards) (for riscv32/64) * [RISCV64 GNU toolchain](https://www.sifive.com/boards) (for riscv32/64)
* [AArch64 GNU toolchain](https://web.stanford.edu/class/cs140e/assignments/0-blinky/) (for aarch64) * [AArch64 GNU toolchain](https://cs140e.sergio.bz/assignments/0-blinky/) (for aarch64)
See [Travis script](./.travis.yml) for details.
### How to run ### How to run
@ -35,9 +37,9 @@ cargo install cargo-xbuild bootimage
``` ```
```bash ```bash
git clone https://github.com//oscourse-tsinghua/rcore_plus.git --recursive git clone https://github.com/oscourse-tsinghua/rcore_plus.git --recursive
cd rcore_plus/kernel cd rcore_plus/kernel
rustup override set nightly-2019-01-01 rustup override set nightly-2019-02-15
make run arch={riscv32,riscv64,x86_64,aarch64} make run arch={riscv32,riscv64,x86_64,aarch64}
``` ```

7
kernel/Makefile
Unescape View File

@ -18,6 +18,7 @@
# graphic = on | off enable/disable qemu graphical output # graphic = on | off enable/disable qemu graphical output
# board = none Running on QEMU # board = none Running on QEMU
# | k210 Only available on riscv64, build without bbl, run on K210 # | k210 Only available on riscv64, build without bbl, run on K210
# | u540 Only available on riscv64, run on HiFive U540, use Sv39
# | raspi3 Only available on aarch64, run on Raspberry Pi 3 Model B/B+ # | raspi3 Only available on aarch64, run on Raspberry Pi 3 Model B/B+
# m_mode Only available on riscv32, build for M-Mode, without MMU # m_mode Only available on riscv32, build for M-Mode, without MMU
@ -90,14 +91,10 @@ endif
else ifeq ($(arch), aarch64) else ifeq ($(arch), aarch64)
qemu_opts += \ qemu_opts += \
-machine $(board) \ -machine $(board) \
-serial null -serial mon:stdio \ -serial null \
-kernel $(bin) -kernel $(bin)
endif endif
ifneq ($(graphic), on)
qemu_opts += -nographic
endif
ifdef d ifdef d
qemu_opts += -d $(d) qemu_opts += -d $(d)
endif endif

Write Preview
Loading…
Cancel
Save