Skip to content

Commit

Permalink
fixup! chore(core): refactor boot_args
Browse files Browse the repository at this point in the history
  • Loading branch information
cepetr committed Nov 7, 2023
1 parent e6fd0e4 commit e8c4b3e
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions core/embed/boardloader/memory_stm32u5a.ld
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ SECTIONS {
. = ALIGN(4);
} >SRAM5

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_command*);
. = ALIGN(4);
. = ALIGN(8);
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS


Expand Down
4 changes: 2 additions & 2 deletions core/embed/bootloader/memory_stm32f4.ld
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ SECTIONS {
. = ALIGN(4);
} >SRAM

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS

}
6 changes: 3 additions & 3 deletions core/embed/bootloader/memory_stm32u5a.ld
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ SECTIONS {
. = ALIGN(4);
} >SRAM5

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_command*);
. = ALIGN(4);
. = ALIGN(8);
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
4 changes: 2 additions & 2 deletions core/embed/bootloader_ci/memory_stm32f4.ld
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ SECTIONS {
. = ALIGN(4);
} >SRAM

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
6 changes: 3 additions & 3 deletions core/embed/bootloader_ci/memory_stm32u5a.ld
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ SECTIONS {
. = ALIGN(4);
} >SRAM5

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_command*);
. = ALIGN(4);
. = ALIGN(8);
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
6 changes: 3 additions & 3 deletions core/embed/firmware/memory_DISC2.ld
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ SECTIONS {
. = ALIGN(4);
} >SRAM5

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_command*);
. = ALIGN(4);
. = ALIGN(8);
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
4 changes: 2 additions & 2 deletions core/embed/firmware/memory_T.ld
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ SECTIONS {
. = ALIGN(4);
} >CCMRAM

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
4 changes: 2 additions & 2 deletions core/embed/prodtest/memory_stm32f4.ld
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ SECTIONS {
. = 4K; /* this acts as a build time assertion that at least this much memory is available for stack use */
} >SRAM

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
6 changes: 3 additions & 3 deletions core/embed/prodtest/memory_stm32u5a.ld
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ SECTIONS {
. = ALIGN(4);
} >SRAM5

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_command*);
. = ALIGN(4);
. = ALIGN(8);
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
4 changes: 2 additions & 2 deletions core/embed/reflash/memory_stm32f4.ld
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ SECTIONS {
. = 4K; /* this acts as a build time assertion that at least this much memory is available for stack use */
} >SRAM

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}
6 changes: 3 additions & 3 deletions core/embed/reflash/memory_stm32u5a.ld
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ SECTIONS {
. = ALIGN(4);
} >SRAM5

.boot_args : ALIGN(4) {
.boot_args : ALIGN(8) {
*(.boot_command*);
. = ALIGN(4);
. = ALIGN(8);
*(.boot_args*);
. = ALIGN(4);
. = ALIGN(8);
} >BOOT_ARGS
}

0 comments on commit e8c4b3e

Please sign in to comment.