Merge branch 'bugfix/riscv_ulp_linker_script_reset_vector_v4.3' into 'release/v4.3'

Fix RISC-V ULP failure to start (v4.3)

See merge request espressif/esp-idf!13464
This commit is contained in:
Angus Gratton
2021-05-07 23:28:43 +00:00
3 changed files with 11 additions and 1 deletions

View File

@@ -149,3 +149,4 @@ add_custom_target(build
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(${ULP_APP_NAME} -T${CMAKE_CURRENT_BINARY_DIR}/${ULP_LD_SCRIPT} ${EXTRA_LINKER_ARGS})
set_target_properties(${ULP_APP_NAME} PROPERTIES LINK_DEPENDS ${ULP_LD_SCRIPT})

View File

@@ -12,10 +12,17 @@ SECTIONS
. = ORIGIN(ram);
.text :
{
*start.S.obj(.text.vectors) /* Default reset vector must link to offset 0x0 */
*(.text)
*(.text*)
} >ram
.rodata ALIGN(4):
{
*(.rodata)
*(.rodata*)
} > ram
.data ALIGN(4):
{
*(.data)

View File

@@ -1,4 +1,4 @@
.section .text
.section .text.vectors
.global irq_vector
.global reset_vector
@@ -11,6 +11,8 @@ reset_vector:
irq_vector:
ret
.section .text
__start:
/* setup the stack pointer */
la sp, __stack_top