djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two fixes, one for ble workflow, one for linking

Browse Source 
BLE workflow had an incorrect list size for characteristics

Linking didn't advance . link it should have without extra ().
This commit is contained in:
Scott Shawcroft 2021-09-01 12:43:43 -07:00
parent b80ffee105
commit 0d280fa83c
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/atmel-samd/boards/common.template.ld
View File

@ -29,8 +29,8 @@ SECTIONS
KEEP(*(.vectors)) /* isr vector table */
/* 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) */
*(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.) */
@ -66,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*)
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.data)) /* .data sections */
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.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 */
@ -79,8 +79,8 @@ SECTIONS
. = ALIGN(4);
_sbss = .;
_szero = .; /* define a global symbol at bss start; used by startup code */
*(.bss)
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*))
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss)))
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
*(COMMON)
. = ALIGN(4);

12
ports/nrf/boards/common.template.ld
View File

@ -62,8 +62,8 @@ SECTIONS
.text :
{
. = ALIGN(4);
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text)) /* .text sections (code) */
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.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 */
@ -82,8 +82,8 @@ SECTIONS
. = ALIGN(4);
_sdata = .; /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
_ram_start = .; /* create a global symbol at ram start for garbage collector */
*(.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);
_edata = .; /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
@ -97,8 +97,8 @@ SECTIONS
{
. = ALIGN(4);
_sbss = .; /* define a global symbol at bss start; used by startup code */
*(.bss)
*(.bss*)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss)))
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
*(COMMON)
. = ALIGN(4);

2
supervisor/shared/bluetooth/serial.c
View File

@ -53,7 +53,7 @@ STATIC bleio_uuid_obj_t supervisor_ble_circuitpython_version_uuid;
const uint8_t circuitpython_base_uuid[16] = {0x6e, 0x68, 0x74, 0x79, 0x50, 0x74, 0x69, 0x75, 0x63, 0x72, 0x69, 0x43, 0x00, 0x00, 0xaf, 0xad };
STATIC mp_obj_list_t characteristic_list;
STATIC mp_obj_t characteristic_list_items[2];
STATIC mp_obj_t characteristic_list_items[3];
STATIC uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
STATIC uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];