TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

all: Update to point to files in new shared/ directory.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2021-07-09 14:19:15 +10:00
parent 4d546713ec
commit 136369d72f
141 changed files with 324 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ports/qemu-arm/Makefile
View File

@@ -16,7 +16,7 @@ ifeq ($(BOARD),netduino2)
CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
CFLAGS += -DQEMU_SOC_STM32
LDSCRIPT = stm32.ld
SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m3.o
MPY_CROSS_FLAGS += -march=armv7m
endif
@@ -25,7 +25,7 @@ CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
CFLAGS += -DQEMU_SOC_NRF51
LDSCRIPT = nrf51.ld
QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m0.o
SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m0.o
MPY_CROSS_FLAGS += -march=armv7m
endif
@@ -33,7 +33,7 @@ ifeq ($(BOARD),mps2-an385)
CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
CFLAGS += -DQEMU_SOC_MPS2
LDSCRIPT = mps2.ld
SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m3.o
MPY_CROSS_FLAGS += -march=armv7m
endif
@@ -42,7 +42,7 @@ CFLAGS += -mcpu=cortex-a9
CFLAGS += -DQEMU_SOC_IMX6
LDSCRIPT = imx6.ld
QEMU_EXTRA = -m 128M
SRC_BOARD_O = lib/utils/gchelper_generic.o
SRC_BOARD_O = shared/runtime/gchelper_generic.o
# It's really armv7a but closest supported value is armv6.
MPY_CROSS_FLAGS += -march=armv6
endif
@@ -79,6 +79,8 @@ SRC_COMMON_C = \
uart.c \
moduos.c \
modmachine.c \
shared/libc/string0.c \
shared/runtime/sys_stdio_mphal.c \
SRC_RUN_C = \
main.c \
@@ -88,7 +90,6 @@ SRC_TEST_C = \
lib/tinytest/tinytest.c \
LIB_SRC_C += $(addprefix lib/,\
libc/string0.c \
libm/math.c \
libm/fmodf.c \
libm/nearbyintf.c \
@@ -108,7 +109,6 @@ LIB_SRC_C += $(addprefix lib/,\
libm/atanf.c \
libm/atan2f.c \
libm/roundf.c \
utils/sys_stdio_mphal.c \
)
OBJ_COMMON =

2
ports/qemu-arm/Makefile.test
View File

@@ -1,4 +1,4 @@
LIB_SRC_C = lib/upytesthelper/upytesthelper.c
LIB_SRC_C = shared/upytesthelper/upytesthelper.c
FROZEN_MANIFEST ?= "freeze('test-frzmpy')"

2
ports/qemu-arm/mpconfigport.h
View File

@@ -74,7 +74,7 @@ extern const struct _mp_obj_module_t mp_module_uos;
#include <alloca.h>
#ifdef TEST
#include "lib/upytesthelper/upytesthelper.h"
#include "shared/upytesthelper/upytesthelper.h"
#undef MP_PLAT_PRINT_STRN
#define MP_PLAT_PRINT_STRN(str, len) upytest_output(str, len)
#endif

2
ports/qemu-arm/test_main.c
View File

@@ -11,7 +11,7 @@
#include "py/stackctrl.h"
#include "py/gc.h"
#include "py/mperrno.h"
#include "lib/utils/gchelper.h"
#include "shared/runtime/gchelper.h"
#include "lib/tinytest/tinytest.h"
#include "lib/tinytest/tinytest_macros.h"