andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2024-11-25 19:03:35 +04:00
Code Issues Projects Releases Wiki Activity

Apply lost patches.

Browse Source
This commit is contained in:
Yifan Wu 2021-04-07 16:39:45 +08:00
parent dbb3d6c561
commit eb61923207
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/Makefile
View File

@ -58,10 +58,9 @@ disasm-vim: kernel
@vim $(DISASM_TMP) @vim $(DISASM_TMP)
@rm $(DISASM_TMP) @rm $(DISASM_TMP)
run: tools run-inner run: run-inner
tools:
(which $(K210-BURNER)) || (cd .. && git clone https://github.com/sipeed/kflash.py.git && mv kflash.py tools)
run-inner: build run-inner: build
ifeq ($(BOARD),qemu) ifeq ($(BOARD),qemu)
@ -71,6 +70,7 @@ ifeq ($(BOARD),qemu)
-bios $(BOOTLOADER) \ -bios $(BOOTLOADER) \
-device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA) -device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA)
else else
(which $(K210-BURNER)) || (cd .. && git clone https://github.com/sipeed/kflash.py.git && mv kflash.py tools)
@cp $(BOOTLOADER) $(BOOTLOADER).copy @cp $(BOOTLOADER) $(BOOTLOADER).copy
@dd if=$(KERNEL_BIN) of=$(BOOTLOADER).copy bs=$(K210_BOOTLOADER_SIZE) seek=1 @dd if=$(KERNEL_BIN) of=$(BOOTLOADER).copy bs=$(K210_BOOTLOADER_SIZE) seek=1
@mv $(BOOTLOADER).copy $(KERNEL_BIN) @mv $(BOOTLOADER).copy $(KERNEL_BIN)
@ -85,4 +85,4 @@ debug: build
tmux split-window -h "riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'" && \ tmux split-window -h "riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'" && \
tmux -2 attach-session -d tmux -2 attach-session -d
.PHONY: build env kernel clean disasm disasm-vim run-inner tools .PHONY: build env kernel clean disasm disasm-vim run-inner

3
os/src/linker-k210.ld
View File

@ -18,6 +18,7 @@ SECTIONS
srodata = .; srodata = .;
.rodata : { .rodata : {
*(.rodata .rodata.*) *(.rodata .rodata.*)
*(.srodata .srodata.*)
} }
. = ALIGN(4K); . = ALIGN(4K);
@ -25,6 +26,7 @@ SECTIONS
sdata = .; sdata = .;
.data : { .data : {
*(.data .data.*) *(.data .data.*)
*(.sdata .sdata.*)
} }
. = ALIGN(4K); . = ALIGN(4K);
@ -33,6 +35,7 @@ SECTIONS
*(.bss.stack) *(.bss.stack)
sbss = .; sbss = .;
*(.bss .bss.*) *(.bss .bss.*)
*(.sbss .sbss.*)
} }
. = ALIGN(4K); . = ALIGN(4K);

3
os/src/linker-qemu.ld
View File

@ -18,6 +18,7 @@ SECTIONS
srodata = .; srodata = .;
.rodata : { .rodata : {
*(.rodata .rodata.*) *(.rodata .rodata.*)
*(.srodata .srodata.*)
} }
. = ALIGN(4K); . = ALIGN(4K);
@ -25,6 +26,7 @@ SECTIONS
sdata = .; sdata = .;
.data : { .data : {
*(.data .data.*) *(.data .data.*)
*(.sdata .sdata.*)
} }
. = ALIGN(4K); . = ALIGN(4K);
@ -33,6 +35,7 @@ SECTIONS
*(.bss.stack) *(.bss.stack)
sbss = .; sbss = .;
*(.bss .bss.*) *(.bss .bss.*)
*(.sbss .sbss.*)
} }
. = ALIGN(4K); . = ALIGN(4K);

3
user/src/linker.ld
View File

@ -13,13 +13,16 @@ SECTIONS
} }
.rodata : { .rodata : {
*(.rodata .rodata.*) *(.rodata .rodata.*)
*(.srodata .srodata.*)
} }
.data : { .data : {
*(.data .data.*) *(.data .data.*)
*(.sdata .sdata.*)
} }
.bss : { .bss : {
start_bss = .; start_bss = .;
*(.bss .bss.*) *(.bss .bss.*)
*(.sbss .sbss.*)
end_bss = .; end_bss = .;
} }
/DISCARD/ : { /DISCARD/ : {