From 97aeb1953be66bc246ac7473b341d840a6d51384 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Sun, 17 Feb 2019 23:48:08 -0500
Subject: correct weak module links; samd module only in m4 ports; update
 libraries

---
 py/circuitpy_mpconfig.h  | 2 --
 py/circuitpy_mpconfig.mk | 7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'py')

diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 910879d06..08e9eb099 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -192,8 +192,6 @@ typedef long mp_off_t;
 #define MICROPY_PY_URE_SUB                    (CIRCUITPY_FULL_BUILD)
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
-    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, \
-    { MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, \
     { MP_ROM_QSTR(MP_QSTR_os), MP_ROM_PTR(&os_module) }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&time_module }, \
 
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 30d5a7554..a4a59170f 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -158,15 +158,12 @@ CIRCUITPY_RTC = 1
 endif
 CFLAGS += -DCIRCUITPY_RTC=$(CIRCUITPY_RTC)
 
+# CIRCUITPY_SAMD is handled in the atmel-samd tree.
 # Only for SAMD chips.
+# Assume not a SAMD build.
 ifndef CIRCUITPY_SAMD
-ifneq ($(findstring sam,$(CHIP_FAMILY)),)
-CIRCUITPY_SAMD = $(CIRCUITPY_FULL_BUILD)
-else
-# Not a SAMD build.
 CIRCUITPY_SAMD = 0
 endif
-endif
 CFLAGS += -DCIRCUITPY_SAMD=$(CIRCUITPY_SAMD)
 
 # Currently always off.
-- 
cgit v1.2.3