8000 Merge pull request #5268 from hathach/nrf-usb-compliance-test · adafruit/circuitpython@b80ffee · GitHub
[go: up one dir, main page]
Skip to content

Commit b80ffee

Browse files
tannewttannewt
authored
Merge pull request #5268 from hathach/nrf-usb-compliance-test
Update tinyusb for USB Compliance Verification test
2 parents cf7e29d + 9c4c3e1 commit b80ffee

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

‎lib/tinyusb

Submodule tinyusb updated 145 files

‎ports/atmel-samd/boards/common.template.ld

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ SECTIONS
2727
. = ALIGN(4);
2828
_sfixed = .;
2929
KEEP(*(.vectors)) /* isr vector table */
30-
*(.text) /* .text sections (code) */
31-
*(.text*) /* .text* sections (code) */
30+
31+
/* Sort text sections so that they have fewer *fill* bytes needed. */
32+
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text)) /* .text sections (code) */
33+
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*)) /* .text* sections (code) */
34+
35+
/* Don't sort rodata because it impacts codegen size. */
3236
*(.rodata) /* .rodata sections (constants, strings, etc.) */
3337
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */
3438

@@ -62,8 +66,8 @@ SECTIONS
6266
_srelocate = .; /* create a global symbol at data start; used by startup code in order to initialize the .data section in RAM */
6367
*(.ramfunc)
6468
*(.ramfunc*)
65-
*(.data) /* .data sections */
66-
*(.data*) /* .data* sections */
69+
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.data)) /* .data sections */
70+
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.data*)) /* .data* sections */
6771

6872
. = ALIGN(4);
6973
_erelocate = .; /* define a global symbol at data end; used by startup code in order to initialize the .data section in RAM */
@@ -76,7 +80,7 @@ SECTIONS
7680
_sbss = .;
7781
_szero = .; /* define a global symbol at bss start; used by startup code */
7882
*(.bss)
79-
*(.bss*)
83+
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*))
8084
*(COMMON)
8185

8286
. = ALIGN(4);

‎ports/nrf/boards/common.template.ld

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ SECTIONS
6262
.text :
6363
{
6464
. = ALIGN(4);
65-
*(.text) /* .text sections (code) */
66-
*(.text*) /* .text* sections (code) */
65+
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text)) /* .text sections (code) */
66+
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*)) /* .text* sections (code) */
6767
*(.rodata) /* .rodata sections (constants, strings, etc.) */
6868
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */
6969
/* *(.glue_7) */ /* glue arm to thumb code */
@@ -73,14 +73,11 @@ SECTIONS
7373
_etext = .; /* define a global symbol at end of code */
7474
} >FLASH_FIRMWARE
7575

76-
/* used by the startup to initialize data */
77-
_sidata = .;
78-
7976
/* This is the initialized data section
8077
The program executes knowing that the data is in the RAM
8178
but the loader puts the initial values in the FLASH (inidata).
8279
It is one task of the startup to copy the initial values from FLASH to RAM. */
83-
.data : AT (_sidata)
80+
.data :
8481
{
8582
. = ALIGN(4);
8683
_sdata = .; /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
@@ -90,7 +87,10 @@ SECTIONS
9087

9188
. = ALIGN(4);
9289
_edata = .; /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
93-
} >APP_RAM
90+
} >APP_RAM AT > FLASH_FIRMWARE
91+
92+
/* used by the startup to initialize data */
93+
_sidata = LOADADDR(.data);
9494

9595
/* Zero-initialized data section */
9696
.bss :

0 commit comments

Comments
 (0)
0