Merge pull request adafruit#5268 from hathach/nrf-usb-compliance-test

tannewt · web-flow · commit b80ffee105f6 · 2021-09-01T10:48:35.000-07:00
Update tinyusb for USB Compliance Verification test
diff --git a/lib/tinyusb b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 3a248951e2744ba89f5fb96eda85a971001115f0
+Subproject commit 38f5aee9c31299874dcda1758cb98e4404c6ad9d
diff --git a/ports/atmel-samd/boards/common.template.ld b/ports/atmel-samd/boards/common.template.ld
@@ -27,8 +27,12 @@ SECTIONS
         . = ALIGN(4);
         _sfixed = .;
         KEEP(*(.vectors)) /* isr vector table */
-        *(.text)           /* .text sections (code) */
-        *(.text*)          /* .text* sections (code) */
+
+        /* Sort text sections so that they have fewer *fill* bytes needed. */
+        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.text))           /* .text sections (code) */
+        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*))          /* .text* sections (code) */
+
+        /* Don't sort rodata because it impacts codegen size. */
         *(.rodata)         /* .rodata sections (constants, strings, etc.) */
         *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
 
@@ -62,8 +66,8 @@ SECTIONS
         _srelocate = .;        /* create a global symbol at data start; used by startup code in order to initialize the .data section in RAM */
         *(.ramfunc)
         *(.ramfunc*)
-        *(.data)           /* .data sections */
-        *(.data*)          /* .data* sections */
+        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.data))           /* .data sections */
+        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.data*))          /* .data* sections */
 
         . = ALIGN(4);
         _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
         _sbss = .;
         _szero = .;         /* define a global symbol at bss start; used by startup code */
         *(.bss)
-        *(.bss*)
+        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*))
         *(COMMON)
 
         . = ALIGN(4);
diff --git a/ports/nrf/boards/common.template.ld b/ports/nrf/boards/common.template.ld
@@ -62,8 +62,8 @@ SECTIONS
     .text :
     {
         . = ALIGN(4);
-        *(.text)           /* .text sections (code) */
-        *(.text*)          /* .text* sections (code) */
+        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.text))           /* .text sections (code) */
+        *SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*))          /* .text* sections (code) */
         *(.rodata)         /* .rodata sections (constants, strings, etc.) */
         *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     /*  *(.glue_7)   */    /* glue arm to thumb code */
@@ -73,14 +73,11 @@ SECTIONS
         _etext = .;        /* define a global symbol at end of code */
     } >FLASH_FIRMWARE
 
-    /* used by the startup to initialize data */
-    _sidata = .;
-
     /* This is the initialized data section
     The program executes knowing that the data is in the RAM
     but the loader puts the initial values in the FLASH (inidata).
     It is one task of the startup to copy the initial values from FLASH to RAM. */
-    .data : AT (_sidata)
+    .data :
     {
         . = ALIGN(4);
         _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
 
         . = ALIGN(4);
         _edata = .;        /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
-    } >APP_RAM
+    } >APP_RAM AT > FLASH_FIRMWARE
+
+    /* used by the startup to initialize data */
+    _sidata = LOADADDR(.data);
 
     /* Zero-initialized data section */
     .bss :
