diff options
Diffstat (limited to 'qemu-arm')
| -rw-r--r-- | qemu-arm/Makefile | 35 | ||||
| -rw-r--r-- | qemu-arm/README.md | 2 | ||||
| -rw-r--r-- | qemu-arm/mpconfigport.h | 4 |
3 files changed, 21 insertions, 20 deletions
diff --git a/qemu-arm/Makefile b/qemu-arm/Makefile index d4bbe8d583..07aa685720 100644 --- a/qemu-arm/Makefile +++ b/qemu-arm/Makefile @@ -34,15 +34,15 @@ endif ## - gcc-arm-none-eabi-4_8-2014q1/share/gcc-arm-none-eabi/samples/src/qemu/Makefile LDFLAGS= --specs=nano.specs --specs=rdimon.specs -Wl,--gc-sections -Wl,-Map=$(@:.elf=.map) -SRC_C = \ - main.c \ +SRC_COMMON_C = \ moduos.c \ modmachine.c \ +SRC_RUN_C = \ + main.c \ + SRC_TEST_C = \ test_main.c \ - moduos.c \ - modmachine.c \ LIB_SRC_C = $(addprefix lib/,\ libm/math.c \ @@ -69,25 +69,24 @@ STM_SRC_C = $(addprefix stmhal/,\ pybstdio.c \ ) -SRC_S = \ +OBJ_COMMON = +OBJ_COMMON += $(PY_O) +OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_COMMON_C:.c=.o)) +OBJ_COMMON += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) +OBJ_COMMON += $(addprefix $(BUILD)/, $(STM_SRC_C:.c=.o)) -OBJ = -OBJ += $(PY_O) -OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) -OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o)) -OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) -OBJ += $(addprefix $(BUILD)/, $(STM_SRC_C:.c=.o)) +OBJ_RUN = +OBJ_RUN += $(addprefix $(BUILD)/, $(SRC_RUN_C:.c=.o)) OBJ_TEST = -OBJ_TEST += $(PY_O) OBJ_TEST += $(addprefix $(BUILD)/, $(SRC_TEST_C:.c=.o)) -OBJ_TEST += $(addprefix $(BUILD)/, $(SRC_S:.s=.o)) -OBJ_TEST += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) -OBJ_TEST += $(addprefix $(BUILD)/, $(STM_SRC_C:.c=.o)) OBJ_TEST += $(BUILD)/tinytest.o +# All object files, needed to get dependencies correct +OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST) + # List of sources for qstr extraction -SRC_QSTR += $(SRC_C) $(STM_SRC_C) +SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(STM_SRC_C) all: run @@ -109,11 +108,11 @@ $(BUILD)/tinytest.o: $(Q)$(CC) $(CFLAGS) -DNO_FORKING -o $@ -c ../tools/tinytest/tinytest.c ## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here. -$(BUILD)/firmware.elf: $(OBJ) +$(BUILD)/firmware.elf: $(OBJ_COMMON) $(OBJ_RUN) $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(Q)$(SIZE) $@ -$(BUILD)/firmware-test.elf: $(OBJ_TEST) +$(BUILD)/firmware-test.elf: $(OBJ_COMMON) $(OBJ_TEST) $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(Q)$(SIZE) $@ diff --git a/qemu-arm/README.md b/qemu-arm/README.md index 329ae4d921..0cf93c7d56 100644 --- a/qemu-arm/README.md +++ b/qemu-arm/README.md @@ -4,7 +4,7 @@ provided by QEMU (http://qemu.org). The purposes of this port are to enable: 1. Continuous integration - - run tests agains architecture-specific parts of code base + - run tests against architecture-specific parts of code base 2. Experimentation - simulation & prototyping of anything that has architecture-specific code diff --git a/qemu-arm/mpconfigport.h b/qemu-arm/mpconfigport.h index 974d3520b3..ebec027e80 100644 --- a/qemu-arm/mpconfigport.h +++ b/qemu-arm/mpconfigport.h @@ -6,7 +6,8 @@ #define MICROPY_EMIT_X64 (0) #define MICROPY_EMIT_THUMB (1) #define MICROPY_EMIT_INLINE_THUMB (1) -#define MICROPY_MEM_STATS (0) +#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1) +#define MICROPY_MEM_STATS (1) #define MICROPY_DEBUG_PRINTERS (0) #define MICROPY_ENABLE_GC (1) #define MICROPY_STACK_CHECK (1) @@ -34,6 +35,7 @@ #define MICROPY_PY_UHEAPQ (1) #define MICROPY_PY_UHASHLIB (1) #define MICROPY_PY_MACHINE (1) +#define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_USE_INTERNAL_PRINTF (0) #define MICROPY_VFS (1) |