From 4f9858e86debaaa4a65f0663ac3c67be15000064 Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 15 Jun 2017 18:55:34 +1000 Subject: stmhal: Move pybstdio.c to lib/utils/sys_stdio_mphal.c for common use. It provides sys.stdin, sys.stdout, sys.stderr for bare-metal targets based on mp_hal functions. --- esp8266/Makefile | 8 ++------ esp8266/esp8266_common.ld | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'esp8266') diff --git a/esp8266/Makefile b/esp8266/Makefile index d234ce022..96f8d504c 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -92,10 +92,6 @@ SRC_C = \ hspi.c \ $(SRC_MOD) -STM_SRC_C = $(addprefix stmhal/,\ - pybstdio.c \ - ) - EXTMOD_SRC_C = $(addprefix extmod/,\ modlwip.c \ ) @@ -125,6 +121,7 @@ LIB_SRC_C = $(addprefix lib/,\ timeutils/timeutils.c \ utils/pyexec.c \ utils/interrupt_char.c \ + utils/sys_stdio_mphal.c \ ) ifeq ($(MICROPY_FATFS), 1) @@ -144,14 +141,13 @@ OBJ = OBJ += $(PY_O) OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o)) -OBJ += $(addprefix $(BUILD)/, $(STM_SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o)) #OBJ += $(BUILD)/pins_$(BOARD).o # List of sources for qstr extraction -SRC_QSTR += $(SRC_C) $(STM_SRC_C) $(EXTMOD_SRC_C) $(DRIVERS_SRC_C) +SRC_QSTR += $(SRC_C) $(EXTMOD_SRC_C) $(DRIVERS_SRC_C) # Append any auto-generated sources that are needed by sources listed in SRC_QSTR SRC_QSTR_AUTO_DEPS += diff --git a/esp8266/esp8266_common.ld b/esp8266/esp8266_common.ld index bc983df70..de5268c8f 100644 --- a/esp8266/esp8266_common.ld +++ b/esp8266/esp8266_common.ld @@ -125,8 +125,6 @@ SECTIONS *lib/timeutils/*.o*(.literal*, .text*) *lib/utils/*.o*(.literal*, .text*) - *stmhal/pybstdio.o(.literal*, .text*) - build/main.o(.literal* .text*) *gccollect.o(.literal* .text*) *gchelper.o(.literal* .text*) -- cgit v1.2.3