From c73bc9e144cfc4932835a3fb3baca50e75874380 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 12 Apr 2025 09:39:49 +0200 Subject: [PATCH] changes XIP start address --- env/ehrenberg/platform.h | 8 +- env/ehrenberg/spi_flash.lds | 180 ++++++++++++++++++++++++++++++++++++ env/start.S | 2 + 3 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 env/ehrenberg/spi_flash.lds diff --git a/env/ehrenberg/platform.h b/env/ehrenberg/platform.h index 8beb4ac..770599c 100644 --- a/env/ehrenberg/platform.h +++ b/env/ehrenberg/platform.h @@ -39,11 +39,15 @@ #define dma PERIPH(dma_t, APB_BASE + 0xB0000) #define msgif PERIPH(mkcontrolclusterstreamcontroller_t, APB_BASE + 0xC0000) -#include "ehrenberg/devices/flexki_messages.h" #include "ehrenberg/devices/fki_cluster_info.h" +#include "ehrenberg/devices/flexki_messages.h" -#define XIP_START_LOC 0xE0040000 +#ifndef XIP_START_LOC +#define XIP_START_LOC 0xE0000000 +#endif +#ifndef RAM_START_LOC #define RAM_START_LOC 0xC0000000 +#endif // Misc diff --git a/env/ehrenberg/spi_flash.lds b/env/ehrenberg/spi_flash.lds new file mode 100644 index 0000000..0666801 --- /dev/null +++ b/env/ehrenberg/spi_flash.lds @@ -0,0 +1,180 @@ +OUTPUT_ARCH( "riscv" ) + +ENTRY( _start ) + +MEMORY +{ + flash (rxai!w) : ORIGIN = 0xE0000000, LENGTH = 16M + ram (wxa!ri) : ORIGIN = 0xC0000000, LENGTH = 128K + dram (wxa!ri) : ORIGIN = 0x00000000, LENGTH = 2048M +} + +PHDRS +{ + flash PT_LOAD; + ram_init PT_LOAD; + ram PT_NULL; + dram PT_NULL; +} + +SECTIONS +{ + __stack_size = DEFINED(__stack_size) ? __stack_size : 2K; + + .init ORIGIN(flash) : + { + KEEP (*(SORT_NONE(.init))) + } >flash AT>flash :flash + + .text : + { + *(.text.unlikely .text.unlikely.*) + *(.text.startup .text.startup.*) + *(.text .text.*) + *(.gnu.linkonce.t.*) + } >flash AT>flash :flash + + .fini : + { + KEEP (*(SORT_NONE(.fini))) + } >flash AT>flash :flash + + PROVIDE (__etext = .); + PROVIDE (_etext = .); + PROVIDE (etext = .); + + .rodata : + { + *(.rdata) + *(.rodata .rodata.*) + *(.gnu.linkonce.r.*) + } >flash AT>flash :flash + + . = ALIGN(4); + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >flash AT>flash :flash + + .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 = .); + } >flash AT>flash :flash + + .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 = .); + } >flash AT>flash :flash + + .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)) + } >flash AT>flash :flash + + .dtors : + { + KEEP (*crtbegin.o(.dtors)) + KEEP (*crtbegin?.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + } >flash AT>flash :flash + + .dummy : + { + *(.comment.*) + + } + .lalign : + { + . = ALIGN(4); + PROVIDE( _data_lma = . ); + } >flash AT>flash :flash + + .dalign : + { + . = ALIGN(4); + PROVIDE( _data = . ); + } >ram AT>flash :ram_init + + .data : + { + __DATA_BEGIN__ = .; + *(.data .data.*) + *(.gnu.linkonce.d.*) + } >ram AT>flash :ram_init + + .sdata : + { + __SDATA_BEGIN__ = .; + *(.sdata .sdata.*) + *(.gnu.linkonce.s.*) + } >ram AT>flash :ram_init + + .srodata : + { + *(.srodata.cst16) + *(.srodata.cst8) + *(.srodata.cst4) + *(.srodata.cst2) + *(.srodata .srodata.*) + } >ram AT>flash :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); + __BSS_END__ = .; + __global_pointer$ = MIN(__SDATA_BEGIN__ + 0x800, MAX(__DATA_BEGIN__ + 0x800, __BSS_END__ - 0x800)); + PROVIDE( _end = . ); + PROVIDE( end = . ); + + .stack ORIGIN(ram) + LENGTH(ram) - __stack_size : + { + PROVIDE( _heap_end = . ); + . = __stack_size; + PROVIDE( _sp = . ); + } >ram AT>ram :ram + + PROVIDE( tohost = 0xfffffff0 ); + PROVIDE( fromhost = 0xfffffff8 ); +} diff --git a/env/start.S b/env/start.S index 0df91a6..3e6ade2 100644 --- a/env/start.S +++ b/env/start.S @@ -8,11 +8,13 @@ _start: .option push .option norelax .option norvc +#ifdef WITH_SIGNATURE j 1f .2byte 0x4e4d .2byte 0x5352 .4byte 0x669 1: +#endif la gp, __global_pointer$ .option pop la sp, _sp