From 8e62de5cdf5468f32ec5e46cba9fadba06b09288 Mon Sep 17 00:00:00 2001 From: stas Date: Tue, 1 Oct 2024 10:56:40 +0200 Subject: [PATCH] add RAM linker file --- env/ehrenberg/init.c | 2 +- env/ehrenberg/ram.lds | 167 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 env/ehrenberg/ram.lds diff --git a/env/ehrenberg/init.c b/env/ehrenberg/init.c index 8f6a88e..3c830cc 100644 --- a/env/ehrenberg/init.c +++ b/env/ehrenberg/init.c @@ -85,7 +85,7 @@ void __attribute__((weak)) handle_m_ext_interrupt(){ void __attribute__((weak)) handle_m_time_interrupt(){ uint64_t time = get_aclint_mtime(aclint); time+=MTIMER_NEXT_TICK_INC; - set_aclint_mtime(aclint, time); + set_aclint_mtimecmp(aclint, time); } void __attribute__((weak)) default_handler(void) { diff --git a/env/ehrenberg/ram.lds b/env/ehrenberg/ram.lds new file mode 100644 index 0000000..9eb6e13 --- /dev/null +++ b/env/ehrenberg/ram.lds @@ -0,0 +1,167 @@ +OUTPUT_ARCH( "riscv" ) + +ENTRY( _start ) + +MEMORY +{ + rom (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128k + ram (wxa!ri) : ORIGIN = 0x80004000, LENGTH = 128k +} + +PHDRS +{ + rom PT_LOAD; + ram_init PT_LOAD; + ram PT_NULL; +} + +SECTIONS +{ + __stack_size = DEFINED(__stack_size) ? __stack_size : 2K; + + .init ORIGIN(rom) : + { + KEEP (*(SORT_NONE(.init))) + } >rom AT>rom :rom + + .text : + { + *(.text.unlikely .text.unlikely.*) + *(.text.startup .text.startup.*) + *(.text .text.*) + *(.gnu.linkonce.t.*) + } >rom AT>rom :rom + + .fini : + { + KEEP (*(SORT_NONE(.fini))) + } >rom AT>rom :rom + + PROVIDE (__etext = .); + PROVIDE (_etext = .); + PROVIDE (etext = .); + + .rodata : + { + *(.rdata) + *(.rodata .rodata.*) + *(.gnu.linkonce.r.*) + } >rom AT>rom :rom + + . = ALIGN(4); + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >rom AT>rom :rom + + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*))) + KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors)) + PROVIDE_HIDDEN (__init_array_end = .); + } >rom AT>rom :rom + + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*))) + KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >rom AT>rom :rom + + .ctors : + { + /* gcc uses crtbegin.o to find the start of + the constructors, so we make sure it is + first. Because this is a wildcard, it + doesn't matter if the user does not + actually link against crtbegin.o; the + linker won't look for a file to match a + wildcard. The wildcard also means that it + doesn't matter which directory crtbegin.o + is in. */ + KEEP (*crtbegin.o(.ctors)) + KEEP (*crtbegin?.o(.ctors)) + /* We don't want to include the .ctor section from + the crtend.o file until after the sorted ctors. + The .ctor section from the crtend file contains the + end of ctors marker and it must be last */ + KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + } >rom AT>rom :rom + + .dtors : + { + KEEP (*crtbegin.o(.dtors)) + KEEP (*crtbegin?.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + } >rom AT>rom :rom + + .lalign : + { + . = ALIGN(4); + PROVIDE( _data_lma = . ); + } >rom AT>rom :rom + + .dalign : + { + . = ALIGN(4); + PROVIDE( _data = . ); + } >ram AT>rom :ram_init + + .data : + { + *(.data .data.*) + *(.gnu.linkonce.d.*) + } >ram AT>rom :ram_init + + .srodata : + { + PROVIDE( __global_pointer$ = . + 0x800 ); + *(.srodata.cst16) + *(.srodata.cst8) + *(.srodata.cst4) + *(.srodata.cst2) + *(.srodata .srodata.*) + } >ram AT>rom :ram_init + + .sdata : + { + *(.sdata .sdata.*) + *(.gnu.linkonce.s.*) + } >ram AT>rom :ram_init + + . = ALIGN(4); + PROVIDE( _edata = . ); + PROVIDE( edata = . ); + + PROVIDE( _fbss = . ); + PROVIDE( __bss_start = . ); + .bss : + { + *(.sbss*) + *(.gnu.linkonce.sb.*) + *(.bss .bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN(4); + } >ram AT>ram :ram + + . = ALIGN(8); + PROVIDE( _end = . ); + PROVIDE( end = . ); + + .stack ORIGIN(ram) + LENGTH(ram) - __stack_size : + { + PROVIDE( _heap_end = . ); + . = __stack_size; + PROVIDE( _sp = . ); + } >ram AT>ram :ram +}