Module Name: src
Committed By: skrll
Date: Sat May 1 07:13:21 UTC 2021
Modified Files:
src/sys/arch/riscv/conf: Makefile.riscv kern.ldscript
Log Message:
Fixup kernel linking and provide a linker script with standard sections
and symbols
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/conf/Makefile.riscv
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/conf/kern.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/riscv/conf/Makefile.riscv
diff -u src/sys/arch/riscv/conf/Makefile.riscv:1.6 src/sys/arch/riscv/conf/Makefile.riscv:1.7
--- src/sys/arch/riscv/conf/Makefile.riscv:1.6 Sat Mar 14 16:12:15 2020
+++ src/sys/arch/riscv/conf/Makefile.riscv Sat May 1 07:13:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.riscv,v 1.6 2020/03/14 16:12:15 skrll Exp $
+# $NetBSD: Makefile.riscv,v 1.7 2021/05/01 07:13:21 skrll Exp $
# Makefile for NetBSD
#
@@ -74,11 +74,17 @@ TEXTADDR?= 0xFFFFFFC000000000
TEXTADDR?= 0xC0001000
.endif
KERNLDSCRIPT?= ${RISCV}/conf/kern.ldscript
-LINKFORMAT+= -T ${KERNLDSCRIPT}
EXTRA_LINKFLAGS= ${LDOPTS} --relax
LINKFLAGS_NORMAL= -X
STRIPFLAGS= -g -X
+# Set the physical load address (aka LMA) to the address that OpenSBI's
+# fw_jump jumps to. This allows us to load the kernel with the -kernel flag
+# in QEMU without having to embed it inside BBL or OpenSBI's fw_payload first.
+#
+KERNEL_PHYS?= 0x80200000
+EXTRA_LINKFLAGS+= --defsym='KERNEL_PHYS=${KERNEL_PHYS}'
+
##
## (6) port specific target dependencies
##
Index: src/sys/arch/riscv/conf/kern.ldscript
diff -u src/sys/arch/riscv/conf/kern.ldscript:1.7 src/sys/arch/riscv/conf/kern.ldscript:1.8
--- src/sys/arch/riscv/conf/kern.ldscript:1.7 Wed Nov 4 07:09:45 2020
+++ src/sys/arch/riscv/conf/kern.ldscript Sat May 1 07:13:21 2021
@@ -1,4 +1,6 @@
-/* $NetBSD: kern.ldscript,v 1.7 2020/11/04 07:09:45 skrll Exp $ */
+/* $NetBSD: kern.ldscript,v 1.8 2021/05/01 07:13:21 skrll Exp $ */
+
+#include "assym.h"
OUTPUT_ARCH(riscv)
ENTRY(start)
@@ -8,8 +10,10 @@ __LARGE_PAGE_SIZE = 0x200000 ;
SECTIONS
{
- .text : AT (ADDR(.text) & 0x0fffffff)
+
+ .text : AT (KERNEL_PHYS)
{
+ PROVIDE(__kernel_text = .);
*(.text)
*(.text.*)
*(.stub)
@@ -19,7 +23,7 @@ SECTIONS
. = ALIGN(__LARGE_PAGE_SIZE);
- __rodata_start = . ;
+ PROVIDE(__rodata_start = .);
.rodata :
{
*(.rodata)
@@ -28,17 +32,36 @@ SECTIONS
*(.srodata.*)
}
+ PROVIDE(_etext = .);
+ PROVIDE(etext = .);
. = ALIGN(__LARGE_PAGE_SIZE);
- __data_start = . ;
.data :
{
+ PROVIDE(__data_start = .);
*(.data)
+ }
+
+ . = ALIGN(COHERENCY_UNIT);
+ .data.cacheline_aligned :
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+ .data.read_mostly :
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+
+ .sdata :
+ {
+ __global_pointer$ = . + 0x800;
*(.sdata)
*(.sdata.*)
}
- _edata = . ;
- PROVIDE (edata = .) ;
+ _edata = .;
+ PROVIDE (edata = .);
__bss_start = .;
.bss :
@@ -50,14 +73,13 @@ SECTIONS
*(COMMON)
. = ALIGN(__LARGE_PAGE_SIZE);
}
-
+ _bss_end__ = . ;
+ __bss_end__ = . ;
. = ALIGN(__PAGE_SIZE);
- /* End of the kernel image */
- __kernel_end = . ;
-
- _end = . ;
- PROVIDE (end = .) ;
+ __end__ = . ;
+ _end = .;
+ PROVIDE(end = .);
.note.netbsd.ident :
{
KEEP(*(.note.netbsd.ident));
