a852c96136
Merge branch 'master' into rust-rv64
...
# Conflicts:
# crate/memory/src/memory_set.rs
# kernel/src/arch/riscv32/compiler_rt.rs
# kernel/src/arch/riscv32/memory.rs
# kernel/src/arch/riscv32/paging.rs
# kernel/src/memory.rs
# kernel/src/process/mod.rs
6 years ago
a4348428a6
can run until update
6 years ago
ed3fb6d423
another temporary
6 years ago
0dbffbc0fa
temporary
6 years ago
9b0b0064d0
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
...
# Conflicts:
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/aarch64/paging.rs
# kernel/src/process/context.rs
6 years ago
d20d22b85b
add hint for user shell. detect cores through 'SMP' env.
6 years ago
fbf59396b2
use 'ucore_*.img' by default
6 years ago
81af2c82fd
aarch64: reduce some warnings, config system/generic timer in Makefile
6 years ago
25ccdf6731
Update and cleanup makefile.
...
* Change few places from riscv64 to riscv32. Previously it was rv64
because the code author does not have a 32bit toolchain and used a
64bit one instead.
* Add new board type 'none', for running on qemu.
6 years ago
d5a6eb2020
user: fix build error
6 years ago
3f2beab52d
Merge branch 'master' into user-img
6 years ago
66ac30d401
user: update make clean in kernel/
6 years ago
710b6d1a28
user: update Makefiles
6 years ago
b5ced136f7
fix merge compile error
6 years ago
2afe8c731e
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
...
# Conflicts:
# crate/memory/src/memory_set.rs
# kernel/Cargo.lock
# kernel/src/arch/aarch64/interrupt/handler.rs
# kernel/src/arch/aarch64/interrupt/mod.rs
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/aarch64/mod.rs
# kernel/src/arch/aarch64/paging.rs
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/memory.rs
# kernel/src/process/context.rs
# tools/riscv-pk/.gitignore
# tools/riscv-pk/LICENSE
# tools/riscv-pk/Makefile.in
# tools/riscv-pk/README.md
# tools/riscv-pk/aclocal.m4
# tools/riscv-pk/bbl/bbl.ac
# tools/riscv-pk/bbl/bbl.c
# tools/riscv-pk/bbl/bbl.h
# tools/riscv-pk/bbl/bbl.lds
# tools/riscv-pk/bbl/bbl.mk.in
# tools/riscv-pk/bbl/logo.c
# tools/riscv-pk/bbl/payload.S
# tools/riscv-pk/bbl/raw_logo.S
# tools/riscv-pk/bbl/riscv_logo.txt
# tools/riscv-pk/config.h.in
# tools/riscv-pk/configure
# tools/riscv-pk/configure.ac
# tools/riscv-pk/dummy_payload/dummy_entry.S
# tools/riscv-pk/dummy_payload/dummy_payload.lds
# tools/riscv-pk/dummy_payload/dummy_payload.mk.in
# tools/riscv-pk/machine/atomic.h
# tools/riscv-pk/machine/bits.h
# tools/riscv-pk/machine/disabled_hart_mask.h
# tools/riscv-pk/machine/emulation.c
# tools/riscv-pk/machine/emulation.h
# tools/riscv-pk/machine/encoding.h
# tools/riscv-pk/machine/fdt.c
# tools/riscv-pk/machine/fdt.h
# tools/riscv-pk/machine/finisher.c
# tools/riscv-pk/machine/finisher.h
# tools/riscv-pk/machine/flush_icache.c
# tools/riscv-pk/machine/htif.c
# tools/riscv-pk/machine/htif.h
# tools/riscv-pk/machine/machine.ac
# tools/riscv-pk/machine/machine.mk.in
# tools/riscv-pk/machine/mcall.h
# tools/riscv-pk/machine/mentry.S
# tools/riscv-pk/machine/minit.c
# tools/riscv-pk/machine/misaligned_ldst.c
# tools/riscv-pk/machine/mtrap.c
# tools/riscv-pk/machine/mtrap.h
# tools/riscv-pk/machine/muldiv_emulation.c
# tools/riscv-pk/machine/uart.c
# tools/riscv-pk/machine/uart.h
# tools/riscv-pk/machine/uart16550.c
# tools/riscv-pk/machine/uart16550.h
# tools/riscv-pk/machine/unprivileged_memory.h
# tools/riscv-pk/machine/vm.h
# tools/riscv-pk/scripts/config.guess
# tools/riscv-pk/scripts/config.sub
# tools/riscv-pk/scripts/install.sh
# tools/riscv-pk/scripts/mk-install-dirs.sh
# tools/riscv-pk/scripts/vcs-version.sh
# tools/riscv-pk/util/snprintf.c
# tools/riscv-pk/util/string.c
# tools/riscv-pk/util/util.mk.in
6 years ago
7855b70bc0
aarch64: add origin raspberrypi config.txt
6 years ago
fcf5074500
impl M-mode kernel for riscv32
6 years ago
a74b893bd2
update Makefile
6 years ago
f882a085d6
user: link created SFS image in kernel
6 years ago
94bc8353f7
user: create SFS image in Makefile
6 years ago
02eb7d9125
update 'riscv-pk' to upstream submodule
6 years ago
18640b7537
impl NoMMU
6 years ago
46f0e85230
add `ucore-i386-pic.img` user programs. reorganize imgs.
6 years ago
b1bdac7d0f
fix merge for aarch64. now it works!
6 years ago
2daf8c188d
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
...
# Conflicts:
# .gitignore
# kernel/Cargo.lock
# kernel/Cargo.toml
# kernel/Makefile
# kernel/riscv32-blog_os.json
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/process/context.rs
# kernel/src/process/mod.rs
6 years ago
40b099ed79
clean riscv-pk in Makefile
6 years ago
7746485861
aarch64: add target 'install' to Makefile
6 years ago
cc936ded35
aarch64: bootable in qemu
6 years ago
81196729e4
Fix RV32 atomic.
...
- Fix __atomic_compare_exchange_4().
- Add patch for core::sync::atomic.
- Revert kernel Mutex.
6 years ago
1140d32aaa
add arch=aarch64 & board=raspi3 to Makefile
6 years ago
5bc392f388
Enable RV32 IPI.
6 years ago
72e92c07f9
Switch to RV64 GNU toolchain. Simplify compiler_rt.
6 years ago
f7b7b1bcd6
added workaround for atomic ops
6 years ago
6cf0d6db23
fixed setting in riscv-pk to enable rv32ia, added smp option in Makefile
6 years ago
cd1bd55729
Update README, travis, riscv crate.
6 years ago
224905f12c
Update Makefile
6 years ago
caeff9ad97
Update packages and fit for new Rust nightly
6 years ago
cbe7affc5d
Merge riscv for QEMU & FPGA
6 years ago
ff8930a36c
Make frame allocator smaller. Fix serial stupid bug.
6 years ago
3d0d6e3d02
Merge branch 'new-rv-toolchain' into board
...
# Conflicts:
# kernel/Makefile
# kernel/src/arch/riscv32/boot/entry.asm
6 years ago
3d6fcb8d8c
Fix x86_64. Not elegant.
6 years ago
10e3cea340
Only use Rust toolchain to build for rv32. Set arch to rv32i. x86_64 broken.
6 years ago
296b6196f4
rv64 toolchain configure for riscv-pk
6 years ago
b88648ff44
Fit for newest Rust nightly. x86_64 ok, riscv32 broken.
6 years ago
7e5726845f
Simple bootloader. Remove riscv-pk.
6 years ago
5647fb1273
Fix build guide
6 years ago
c768ec3e1e
Recover fs for RV32. Add user-riscv.img
...
Now load user programs from SFS data linked at kernel.
6 years ago
019770c92d
Modify build path
6 years ago
c0138c4c35
Fix linking user program binaries
6 years ago
4faa8a65ae
Move kernel to a new directory
6 years ago
WangRunji
dzy
equation314
maoyuchaxue