Skip to content

Bring linker scripts in sync with pico-sdk original. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvds00 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bring linker scripts in sync with pico-sdk original. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4099a60
*.ld: updated to match memmap_default.ld (on which they are based) again
mvds00 Nov 8, 2023
ab7cef8
picowota: tweak ld scripts for fix strange issue in picowota binary g…
mvds00 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions bootloader_shell.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,15 @@ SECTIONS
__binary_info_end = .;
. = ALIGN(4);

/* End of .text-like segments */
__etext = .;

.ram_vector_table (COPY): {
.ram_vector_table (NOLOAD): {
Copy link
Owner

@usedbytes usedbytes Nov 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: you added a space to the start of this line in both linker scripts

Copy link
Contributor Author

@mvds00 mvds00 Nov 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right, I aligned it with the other entries while I was at it.

*(.ram_vector_table)
} > RAM

.uninitialized_data (NOLOAD): {
. = ALIGN(4);
*(.uninitialized_data*)
} > RAM

.data : {
__data_start__ = .;
*(vtable)
Expand Down Expand Up @@ -198,11 +200,8 @@ SECTIONS
/* All data end */
__data_end__ = .;
} > RAM AT> FLASH

.uninitialized_data (COPY): {
. = ALIGN(4);
*(.uninitialized_data*)
} > RAM
/* __etext is (for backwards compatibility) the name of the .data init source pointer (...) */
__etext = LOADADDR(.data);

/* Start and end symbols must be word-aligned */
.scratch_x : {
Expand Down Expand Up @@ -230,11 +229,11 @@ SECTIONS
__bss_end__ = .;
} > RAM

.heap (COPY):
.heap (NOLOAD):
{
__end__ = .;
end = __end__;
*(.heap*)
KEEP(*(.heap*))
__HeapLimit = .;
} > RAM

Expand All @@ -247,17 +246,17 @@ SECTIONS
/* by default we put core 0 stack at the end of scratch Y, so that if core 1
* stack is not used then all of SCRATCH_X is free.
*/
.stack1_dummy (COPY):
.stack1_dummy (NOLOAD):
{
*(.stack1*)
} > SCRATCH_X
.stack_dummy (COPY):
.stack_dummy (NOLOAD):
{
*(.stack*)
KEEP(*(.stack*))
} > SCRATCH_Y

.flash_end : {
__flash_binary_end = .;
PROVIDE(__flash_binary_end = .);
} > FLASH

/* stack limit is poorly named, but historically is maximum heap ptr */
Expand Down
29 changes: 14 additions & 15 deletions standalone.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,15 @@ SECTIONS
__binary_info_end = .;
. = ALIGN(4);

/* End of .text-like segments */
__etext = .;

.ram_vector_table (COPY): {
.ram_vector_table (NOLOAD): {
*(.ram_vector_table)
} > RAM

.uninitialized_data (NOLOAD): {
. = ALIGN(4);
*(.uninitialized_data*)
} > RAM

.data : {
__data_start__ = .;
*(vtable)
Expand Down Expand Up @@ -155,11 +157,8 @@ SECTIONS
/* All data end */
__data_end__ = .;
} > RAM AT> FLASH

.uninitialized_data (COPY): {
. = ALIGN(4);
*(.uninitialized_data*)
} > RAM
/* __etext is (for backwards compatibility) the name of the .data init source pointer (...) */
__etext = LOADADDR(.data);

/* Start and end symbols must be word-aligned */
.scratch_x : {
Expand Down Expand Up @@ -187,11 +186,11 @@ SECTIONS
__bss_end__ = .;
} > RAM

.heap (COPY):
.heap (NOLOAD):
{
__end__ = .;
end = __end__;
*(.heap*)
KEEP(*(.heap*))
__HeapLimit = .;
} > RAM

Expand All @@ -204,17 +203,17 @@ SECTIONS
/* by default we put core 0 stack at the end of scratch Y, so that if core 1
* stack is not used then all of SCRATCH_X is free.
*/
.stack1_dummy (COPY):
.stack1_dummy (NOLOAD):
{
*(.stack1*)
} > SCRATCH_X
.stack_dummy (COPY):
.stack_dummy (NOLOAD):
{
*(.stack*)
KEEP(*(.stack*))
} > SCRATCH_Y

.flash_end : {
__flash_binary_end = .;
PROVIDE(__flash_binary_end = .);
} > FLASH

/* stack limit is poorly named, but historically is maximum heap ptr */
Expand Down