diff options
| author | Kimplul <kimi.h.kuparinen@gmail.com> | 2021-12-19 17:10:36 +0200 |
|---|---|---|
| committer | Kimplul <kimi.h.kuparinen@gmail.com> | 2021-12-19 17:10:36 +0200 |
| commit | 9966b49db468de0168c7a455dfb5b4c66c413c4d (patch) | |
| tree | df31febe5e1ae52bae68ebe1df8b4469b97e0546 /arch/riscv/conf | |
| parent | 8bb1e280280c2f30740defca68ea643c56a3d880 (diff) | |
| download | kmi-9966b49db468de0168c7a455dfb5b4c66c413c4d.tar.gz kmi-9966b49db468de0168c7a455dfb5b4c66c413c4d.zip | |
Massive changes to jump to userspace
Diffstat (limited to 'arch/riscv/conf')
| -rw-r--r-- | arch/riscv/conf/apos.its | 2 | ||||
| -rw-r--r-- | arch/riscv/conf/init-link.S | 31 | ||||
| -rw-r--r-- | arch/riscv/conf/kernel-link.S | 4 |
3 files changed, 3 insertions, 34 deletions
diff --git a/arch/riscv/conf/apos.its b/arch/riscv/conf/apos.its index 7c05044..1581025 100644 --- a/arch/riscv/conf/apos.its +++ b/arch/riscv/conf/apos.its @@ -7,7 +7,7 @@ images { kernel { description = "Garbaggio"; - data = /incbin/("../../../apos.bin"); + data = /incbin/("../../../kernel.bin"); type = "kernel"; arch = "riscv"; os = "apos"; diff --git a/arch/riscv/conf/init-link.S b/arch/riscv/conf/init-link.S deleted file mode 100644 index c9a6da2..0000000 --- a/arch/riscv/conf/init-link.S +++ /dev/null @@ -1,31 +0,0 @@ -OUTPUT_ARCH(riscv) -ENTRY(_start) - -SECTIONS { - . = ABSOLUTE(PM_KERN); - __init_start = .; - - /* objcopy only copies these three sections (as far as I'm aware) into the - produces binary, so __init_end should point to the correct location in the - final binary - */ - .text ALIGN(4K) : AT(0) { - *(.init.start) - *(.text*); - } - - .rodata : { - *(.rodata*) - } - - .data : { - *(.data*) - } - - .bss : { - *(.bss*) *(COMMON) - } - - __kernel_size = <KERNEL_SIZE>; - __init_end = . ; -} diff --git a/arch/riscv/conf/kernel-link.S b/arch/riscv/conf/kernel-link.S index d3b1223..bf0ad28 100644 --- a/arch/riscv/conf/kernel-link.S +++ b/arch/riscv/conf/kernel-link.S @@ -2,10 +2,10 @@ OUTPUT_ARCH(riscv) ENTRY(main) SECTIONS { - . = ABSOLUTE(VM_KERN); + . = ABSOLUTE(PM_KERN); __kernel_start = .; - .text ALIGN(4K) : AT(0) { + .text : AT(0) { *(.kernel.start); *(.text*); } |