Merge pull request #2557 from openmv/btree_disable

ports/stm32: Disable btree by default.
This commit is contained in:
Ibrahim Abdelkader 2024-12-23 10:50:13 +02:00 committed by GitHub
commit 4b31742d38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 29 deletions

View File

@ -142,6 +142,11 @@ MPY_CFLAGS += -DMICROPY_PY_IMU=1
MICROPY_ARGS += MICROPY_PY_IMU=1 MICROPY_ARGS += MICROPY_PY_IMU=1
endif endif
ifeq ($(MICROPY_PY_BTREE), 1)
MPY_CFLAGS += -DMICROPY_PY_BTREE=1
MICROPY_ARGS += MICROPY_PY_BTREE=1
endif
ifeq ($(MICROPY_PY_TOF), 1) ifeq ($(MICROPY_PY_TOF), 1)
MPY_CFLAGS += -DMICROPY_PY_TOF=1 MPY_CFLAGS += -DMICROPY_PY_TOF=1
MICROPY_ARGS += MICROPY_PY_TOF=1 MICROPY_ARGS += MICROPY_PY_TOF=1

View File

@ -374,32 +374,6 @@ soft_reset_exit:
goto soft_reset; goto soft_reset;
} }
#if MICROPY_PY_BTREE
void *malloc(size_t size) {
void *p = gc_alloc(size, false);
if (p == NULL) {
errno = ENOMEM;
}
return p;
}
void free(void *ptr) {
gc_free(ptr);
}
void *calloc(size_t nmemb, size_t size) {
return malloc(nmemb * size);
}
void *realloc(void *ptr, size_t size) {
void *p = gc_realloc(ptr, size, true);
if (p == NULL) {
errno = ENOMEM;
}
return p;
}
#endif
static mp_obj_t pyb_main(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { static mp_obj_t pyb_main(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
// Unused. // Unused.
return mp_const_none; return mp_const_none;

View File

@ -92,15 +92,13 @@ MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/shared/runtime/
MPY_CFLAGS += -DMICROPY_PY_SSL=1 \ MPY_CFLAGS += -DMICROPY_PY_SSL=1 \
-DMICROPY_SSL_MBEDTLS=1 \ -DMICROPY_SSL_MBEDTLS=1 \
-DMICROPY_STREAMS_POSIX_API=1 \ -DMICROPY_STREAMS_POSIX_API=1 \
-DMICROPY_VFS_FAT=1 \ -DMICROPY_VFS_FAT=1
-DMICROPY_PY_BTREE=1
MICROPY_ARGS += STM32LIB_CMSIS_DIR=$(TOP_DIR)/$(CMSIS_DIR) \ MICROPY_ARGS += STM32LIB_CMSIS_DIR=$(TOP_DIR)/$(CMSIS_DIR) \
STM32LIB_HAL_DIR=$(TOP_DIR)/$(HAL_DIR) \ STM32LIB_HAL_DIR=$(TOP_DIR)/$(HAL_DIR) \
MICROPY_PY_SSL=1 \ MICROPY_PY_SSL=1 \
MICROPY_SSL_MBEDTLS=1 \ MICROPY_SSL_MBEDTLS=1 \
MICROPY_PY_BTREE=1\
MICROPY_PY_OPENAMP=$(MICROPY_PY_OPENAMP)\ MICROPY_PY_OPENAMP=$(MICROPY_PY_OPENAMP)\
MICROPY_PY_OPENAMP_REMOTEPROC=$(MICROPY_PY_OPENAMP_REMOTEPROC) MICROPY_PY_OPENAMP_REMOTEPROC=$(MICROPY_PY_OPENAMP_REMOTEPROC)
@ -354,10 +352,12 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/shared/,\
readline/readline.o \ readline/readline.o \
) )
ifeq ($(MICROPY_PY_BTREE), 1)
FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/,\ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/,\
berkeley-db-1.xx/btree/*.o \ berkeley-db-1.xx/btree/*.o \
berkeley-db-1.xx/mpool/*.o \ berkeley-db-1.xx/mpool/*.o \
) )
endif
#------------- mbedtls -------------------# #------------- mbedtls -------------------#
FIRM_OBJ += $(wildcard $(BUILD)/$(MICROPY_DIR)/lib/mbedtls/library/*.o) FIRM_OBJ += $(wildcard $(BUILD)/$(MICROPY_DIR)/lib/mbedtls/library/*.o)