@@ -73,6 +73,7 @@ INC += $(addprefix -Iasf/sam0/,\
73
73
)
74
74
INC += -Iasf/thirdparty/CMSIS/Include
75
75
INC += -Iboards/$(BOARD ) /
76
+ INC += -Ifreetouch/
76
77
INC += -I$(BUILD )
77
78
78
79
CFLAGS_CORTEX_M0 = \
@@ -144,8 +145,8 @@ CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
144
145
endif
145
146
146
147
# LIBM_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-file-name=libm.a)
147
- LDFLAGS = $(CFLAGS ) -nostartfiles -fshort-enums -mthumb -mcpu=cortex-m0plus -Lasf/thirdparty/CMSIS/Lib/GCC/ -LQTouch/ - Wl,-nostdlib -Wl,-T,$(LD_FILE ) -Wl,-Map=$@ .map -Wl,-cref -Wl,-gc-sections -specs=nano.specs
148
- LIBS = -larm_cortexM0l_math -lsamd21_qtouch_gcc - lm -lgcc -lc
148
+ LDFLAGS = $(CFLAGS ) -nostartfiles -fshort-enums -mthumb -mcpu=cortex-m0plus -Lasf/thirdparty/CMSIS/Lib/GCC/ -Wl,-nostdlib -Wl,-T,$(LD_FILE ) -Wl,-Map=$@ .map -Wl,-cref -Wl,-gc-sections -specs=nano.specs
149
+ LIBS = -larm_cortexM0l_math -lm -lgcc -lc
149
150
150
151
SRC_ASF = $(addprefix asf/sam0/,\
151
152
drivers/adc/adc_sam_d_r/adc.c \
@@ -201,6 +202,7 @@ SRC_C = \
201
202
asf/sam0/utils/syscalls/gcc/syscalls.c \
202
203
boards/$(BOARD ) /init.c \
203
204
boards/$(BOARD ) /pins.c \
205
+ freetouch/adafruit_ptc.c \
204
206
lib/fatfs/ff.c \
205
207
lib/fatfs/option/ccsbcs.c \
206
208
lib/timeutils/timeutils.c \
@@ -236,17 +238,11 @@ SRC_BINDINGS = \
236
238
busio/UART.c \
237
239
neopixel_write/__init__.c \
238
240
time/__init__.c \
241
+ touchio/__init__.c \
242
+ touchio/TouchIn.c \
239
243
usb_hid/__init__.c \
240
244
usb_hid/Device.c
241
245
242
- # Handle touch support on its own since it only fits in the image when external
243
- # flash is used to store the file system.
244
- # TODO(tannewt): Remove this after we switch to freetouch and rely on the linker
245
- # to drop classes we don't need.
246
- ifneq ($(FLASH_IMPL ) ,internal_flash.c)
247
- SRC_BINDINGS += touchio/__init__.c touchio/TouchIn.c
248
- endif
249
-
250
246
SRC_BINDINGS_EXPANDED = $(addprefix shared-bindings/, $(SRC_BINDINGS ) ) \
251
247
$(addprefix common-hal/, $(SRC_BINDINGS ) )
252
248
0 commit comments