diff options
| author | Radomir Dopieralski <openstack@sheep.art.pl> | 2018-05-20 22:06:47 +0200 |
|---|---|---|
| committer | Radomir Dopieralski <openstack@sheep.art.pl> | 2018-05-21 09:23:58 +0200 |
| commit | 6a6ab2b0ec6419285849335c81587695cf9618e6 (patch) | |
| tree | b48646ca65a1f9acb5ce13a11591c337f5697c3c | |
| parent | be12e07d7437b9f2a75659bc944c15cccc8e93c1 (diff) | |
Allow overriding EXTRA_BUILTIN_MODULES in mpconfigboard.h
Some boards (like the uGame10) may want to have their own set of extra
modules. This change lets them override EXTRA_BUILTIN_MODULES in their
mpconfigboard.h and makes the ugame10 board do that.
| -rw-r--r-- | ports/atmel-samd/boards/ugame10/mpconfigboard.h | 5 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/ugame10/mpconfigboard.mk | 3 | ||||
| -rw-r--r-- | ports/atmel-samd/mpconfigport.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.h b/ports/atmel-samd/boards/ugame10/mpconfigboard.h index 1652314ed..4e5e88569 100644 --- a/ports/atmel-samd/boards/ugame10/mpconfigboard.h +++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.h @@ -47,3 +47,8 @@ #define EXTERNAL_FLASH_DEVICES S25FL216K #include "external_flash/external_flash.h" + +#define EXTRA_BUILTIN_MODULES \ + { MP_OBJ_NEW_QSTR(MP_QSTR_audioio), (mp_obj_t)&audioio_module }, \ + { MP_OBJ_NEW_QSTR(MP_QSTR_gamepad),(mp_obj_t)&gamepad_module }, \ + { MP_OBJ_NEW_QSTR(MP_QSTR__stage), (mp_obj_t)&stage_module } diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk index 343115fbb..346dcc658 100644 --- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk +++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk @@ -9,3 +9,6 @@ SPI_FLASH_FILESYSTEM = 1 CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 + + +FROZEN_MPY_DIRS += $(TOP)/frozen/ugame10 diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h index 8e726f9b7..959d96986 100644 --- a/ports/atmel-samd/mpconfigport.h +++ b/ports/atmel-samd/mpconfigport.h @@ -207,18 +207,22 @@ extern const struct _mp_obj_module_t usb_hid_module; #define AUDIOBUSIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_audiobusio), (mp_obj_t)&audiobusio_module }, #endif + #ifndef EXTRA_BUILTIN_MODULES #define EXTRA_BUILTIN_MODULES \ { MP_OBJ_NEW_QSTR(MP_QSTR_audioio), (mp_obj_t)&audioio_module }, \ AUDIOBUSIO_MODULE \ { MP_OBJ_NEW_QSTR(MP_QSTR_bitbangio), (mp_obj_t)&bitbangio_module }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_gamepad),(mp_obj_t)&gamepad_module } + #endif #define EXPRESS_BOARD #else #define MICROPY_PY_BUILTINS_REVERSED (0) #define MICROPY_PY_MICROPYTHON_MEM_INFO (0) #define MICROPY_PY_FRAMEBUF (0) + #ifndef EXTRA_BUILTIN_MODULES #define EXTRA_BUILTIN_MODULES + #endif #define MICROPY_PY_BUILTINS_COMPLEX (0) |