Skip to content
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.

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

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
12 changes: 6 additions & 6 deletions bootloader_shell.ld
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,15 @@ SECTIONS
__binary_info_end = .;
. = ALIGN(4);

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

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

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 +203,6 @@ SECTIONS
/* __etext is (for backwards compatibility) the name of the .data init source pointer (...) */
__etext = LOADADDR(.data);

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

/* Start and end symbols must be word-aligned */
.scratch_x : {
__scratch_x_start__ = .;
Expand Down
12 changes: 6 additions & 6 deletions standalone.ld
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,15 @@ SECTIONS
__binary_info_end = .;
. = ALIGN(4);

.ram_vector_table (NOLOAD): {
.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 +160,6 @@ SECTIONS
/* __etext is (for backwards compatibility) the name of the .data init source pointer (...) */
__etext = LOADADDR(.data);

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

/* Start and end symbols must be word-aligned */
.scratch_x : {
__scratch_x_start__ = .;
Expand Down