From dcd2b684b30ba2f797473e3f3dc65c7f4f6a8e4c Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Thu, 31 Dec 2020 23:27:04 +0200 Subject: [PATCH] Enable NRF ulab module. --- src/micropython | 2 +- src/omv/ports/nrf/omv_portconfig.mk | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/micropython b/src/micropython index dfb96a35a..da17ebeff 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit dfb96a35ae19e8439842b0bbb43ce00515409cf4 +Subproject commit da17ebeffd1636cd4efc46d05e8f56a6e013d33b diff --git a/src/omv/ports/nrf/omv_portconfig.mk b/src/omv/ports/nrf/omv_portconfig.mk index 3c9aeae2f..9d01cda66 100644 --- a/src/omv/ports/nrf/omv_portconfig.mk +++ b/src/omv/ports/nrf/omv_portconfig.mk @@ -20,6 +20,9 @@ HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/hal/ HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/soc/ HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/prs/ +ifeq ($(MICROPY_PY_ULAB), 1) +MPY_CFLAGS += -DMP_NEED_LOG2 +endif MPY_CFLAGS += -I$(MP_BOARD_CONFIG_DIR) MPY_CFLAGS += -I$(BUILD)/$(MICROPY_DIR)/ MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ @@ -237,6 +240,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/libm/,\ fmodf.o \ nearbyintf.o \ ef_sqrt.o \ + erf_lgamma.o \ kf_rem_pio2.o \ kf_sin.o \ kf_cos.o \ @@ -248,10 +252,17 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/libm/,\ sf_frexp.o \ sf_modf.o \ sf_ldexp.o \ + sf_erf.o \ asinfacosf.o \ atanf.o \ atan2f.o \ roundf.o \ + log1pf.o \ + acoshf.o \ + asinhf.o \ + atanhf.o \ + wf_lgamma.o \ + wf_tgamma.o \ ) FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/modules/,\