Skip to content

Commit

Permalink
update doc
Browse files Browse the repository at this point in the history
  • Loading branch information
Godones committed Feb 27, 2024
1 parent 50c9ad8 commit 94bc759
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 50 deletions.
15 changes: 8 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ BOOTLOADER := default
KERNEL_BIN := $(KERNEL_FILE).bin
IMG := tools/sdcard.img
FSMOUNT := ./diskfs
TFTPBOOT := /home/godones/projects/tftpboot
TFTPBOOT := /home/godones/projects/tftpboot/
SMP ?= 1
GUI ?=n
NET ?=y
Expand Down Expand Up @@ -135,24 +135,24 @@ fake_run:

board:install compile
@rust-objcopy --strip-all $(KERNEL_FILE) -O binary $(OUTPUT)/testos.bin
@cp $(OUTPUT)/testos.bin /home/godones/projects/tftpboot/
@cp $(OUTPUT)/testos.bin $(TFTPBOOT)
@cp $(OUTPUT)/testos.bin ./alien.bin

qemu:
@rust-objcopy --strip-all $(OUTPUT)/boot -O binary $(OUTPUT)/testos.bin
@cp $(OUTPUT)/testos.bin /home/godones/projects/tftpboot/
@cp $(OUTPUT)/testos.bin $(TFTPBOOT)
@cp $(OUTPUT)/testos.bin ./alien.bin

vf2:board
@mkimage -f ./tools/vf2.its ./alien-vf2.itb
@rm ./kernel-qemu
@cp ./alien-vf2.itb /home/godones/projects/tftpboot/
@cp ./alien-vf2.itb $(TFTPBOOT)


unmatched:board
@mkimage -f ./tools/fu740.its ./alien-unmatched.itb
@rm ./kernel-qemu
@cp ./alien-unmatched.itb /home/godones/projects/tftpboot/
@cp ./alien-unmatched.itb $(TFTPBOOT)

f_test:
qemu-system-riscv64 \
Expand Down Expand Up @@ -252,11 +252,12 @@ help:
@echo " LOG: enable log, default n, options: TRACE, DEBUG, INFO, WARN, ERROR"
@echo " build [SMP=?] [LOG=?]: build kernel"
@echo " sdcard [GUI=?] [FS=?]: build sdcard"
@echo " fake_run [SMP=?] [GUI=?]: run kernel without building"
@echo " GUI: enable gui, it's available only when running qemu"
@echo " FS: file system, for vf2 or unmatched, only fat is available"
@echo " fake_run [SMP=?] [GUI=?]: run kernel without building, the SMP should same as build"
@echo " vf2 [SMP=?] [LOG=?] [VF2=y]: build starfive2 board image"
@echo " SMP: number of cores, must >= 2"
@echo " VF2: must be y"

@echo " unmatched [SMP=?] [LOG=?] [UNMATCHED=y]: build unmatched board image"
@echo " SMP: number of cores, must >= 2"
@echo " UNMATCHED: must be y"
Expand Down
52 changes: 9 additions & 43 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,62 +48,28 @@ make help
```

```
# 一键运行
# 可以指定LOG=ERROR/WARN/INFO/DEBUG/TRACE开启调式
make run [LOG=] [SMP=]
```

构建测试程序镜像:

```
make sdcard [GUI=n/y]
```

如果只想重新构建`kernel`而不改变测试程序,可以使用:

```
make build LOG= [LOG=] [SMP=]
```

使用已经编译好的程序运行而不是再次编译可以使用:

```
# 确保和make build的SMP一致
make fake_run [SMP=]
```

运行测试(in bash)

```
# 一键运行qemu
make run
# run test
> cd tests
> ls
> final_test
> ./final_test
```

### Run with GUI (QEMU)

```
make run GUI=y
cd bin
cd tests
slint or guitest or todo or printdemo or memorygame or ...
```

### Run VisionFive2

```
make sdcard
// 制作fat32
make vf2 LOG=WARN VF2=y SMP=2
// 生成testos.bin
// 这里smp=2 表示的是单核启动,对于u74-mc处理器,0号核不会被启动,从1号开始。
```
### [Run VisionFive2](./docs/doc/boot.md)

## Run Unmatched
Update the `TFTPBOOT` variable in Makefile.

```
make sdcard
// 制作fat32
make unmatched LOG= UNMATCHED=y SMP=2
make vf2 VF2=y SMP=2
// 生成testos.bin
// 这里smp=2 表示的是单核启动,对于u74-mc处理器,0号核不会被启动,从1号开始。
```
Expand All @@ -113,7 +79,7 @@ make unmatched LOG= UNMATCHED=y SMP=2
1. `make gdb-server`
2. `make gdb-client`

## [Doc](docs/doc/doc.md)
## [Doc](https://godones.github.io/Alien/)



Expand Down

0 comments on commit 94bc759

Please sign in to comment.