8000 cxd56 needed more precise include for __packed; needed SRC_C += on so… · jensechu/circuitpython@f51e75c · GitHub
[go: up one dir, main page]
Skip to content

Commit f51e75c

Browse files
dhalbertdhalbert
committed
cxd56 needed more precise include for __packed; needed SRC_C += on some ports
1 parent 82b49af commit f51e75c

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

‎devices/ble_hci/common-hal/_bleio/Adapter.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "shared-bindings/_bleio/Address.h"
4646
#include "shared-bindings/_bleio/Characteristic.h"
4747
#include "shared-bindings/_bleio/Service.h"
48-
#include "shared-bindings/nvm/ByteArray.h"
4948
#include "shared-bindings/_bleio/Connection.h"
5049
#include "shared-bindings/_bleio/ScanEntry.h"
5150
#include "shared-bindings/time/__init__.h"

‎devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <stdbool.h>
1313
// for __packed
14-
#include <string.h>
14+
#include <sys/cdefs.h>
1515

1616
#define BT_EATT_PSM 0x27
1717
#define BT_ATT_DEFAULT_LE_MTU 23

‎devices/ble_hci/common-hal/_bleio/hci_include/hci.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
#define ZEPHYR_INCLUDE_BLUETOOTH_HCI_H_
1313

1414
#include <stdbool.h>
15-
#include <string.h>
15+
// for __packed
16+
#include <sys/cdefs.h>
17+
1618
#include "addr.h"
1719

1820
#define BIT(n) (1UL << (n))

‎mpy-cross/mpy-cross.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ LDFLAGS += -static -static-libgcc -static-libstdc++
6666
endif
6767

6868
# source files
69-
SRC_C = \
69+
SRC_C += \
7070
main.c \
7171
gccollect.c \
7272
supervisor/stub/safe_mode.c \

‎ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ LONGINT_IMPL = MPZ
1111

1212
# Not needed.
1313
CIRCUITPY_AUDIOBUSIO = 0
14-
CIRCUITPY_FRAMEBUFFERIO = 0
14+
CIRCUITPY_AUDIOMP3 = 0
15+
CIRCUITPY_BLEIO_HCI = 0
1516
CIRCUITPY_DISPLAYIO = 0
16-
CIRCUITPY_RGBMATRIX = 0
17+
CIRCUITPY_FRAMEBUFFERIO = 0
1718
CIRCUITPY_PS2IO = 0
18-
CIRCUITPY_AUDIOMP3 = 0
19-
19+
CIRCUITPY_RGBMATRIX = 0
2020
CIRCUITPY_ULAB = 0
2121

2222
# Override optimization to keep binary small

‎ports/cxd56/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE))
162162

163163
SRC_S = supervisor/cpu.s
164164

165-
SRC_C = \
165< 8000 span class="diff-text-marker">+
SRC_C += \
166166
background.c \
167167
fatfs_port.c \
168168
mphalport.c \

‎ports/mimxrt10xx/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ SRC_SDK := \
147147

148148
SRC_SDK := $(addprefix sdk/devices/$(CHIP_FAMILY)/, $(SRC_SDK))
149149

150-
SRC_C = \
150+
SRC_C += \
151151
background.c \
152152
boards/$(BOARD)/board.c \
153153
boards/$(BOARD)/flash_config.c \

‎ports/unix/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 6215 @@ SRC_MOD += modjni.c
134134
endif
135135

136136
# source files
137-
SRC_C = \
137+
SRC_C += \
138138
main.c \
139139
gccollect.c \
140140
unix_mphal.c \

0 commit comments

Comments
 (0)
0