nrf/boards/microbit: Add framework updates to build micro:bit modules.

Makefile and mpconfigport.h update is generic, and could be used by other
boards to give extra modules which are only for a selected board.
This commit is contained in:
Glenn Ruben Bakke 2017-10-12 00:22:44 +02:00 committed by Damien George
parent fbc45bd3f3
commit 9e090a8783
4 changed files with 66 additions and 1 deletions

View File

@ -26,6 +26,10 @@ else
include drivers/bluetooth/bluetooth_common.mk include drivers/bluetooth/bluetooth_common.mk
endif endif
ifeq ($(shell test -e boards/$(BOARD)/modules/boardmodules.mk && echo -n yes),yes)
include boards/$(BOARD)/modules/boardmodules.mk
endif
# qstr definitions (must come before including py.mk) # qstr definitions (must come before including py.mk)
QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
@ -264,7 +268,7 @@ $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
$(Q)$(SIZE) $@ $(Q)$(SIZE) $@
# List of sources for qstr extraction # List of sources for qstr extraction
SRC_QSTR += $(SRC_C) $(SRC_MOD) $(SRC_LIB) $(DRIVERS_SRC_C) SRC_QSTR += $(SRC_C) $(SRC_MOD) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES)
# Append any auto-generated sources that are needed by sources listed in # Append any auto-generated sources that are needed by sources listed in
# SRC_QSTR # SRC_QSTR

View File

@ -0,0 +1,35 @@
/*
* This file is part of the MicroPython project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2017 Glenn Ruben Bakke
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MICROPY_INCLUDED_NRF_BOARD_MICROBIT_BOARD_MODULES_H
#define MICROPY_INCLUDED_NRF_BOARD_MICROBIT_BOARD_MODULES_H
extern const struct _mp_obj_module_t microbit_module;
#define BOARD_MODULES \
{ MP_ROM_QSTR(MP_QSTR_microbit), MP_ROM_PTR(&microbit_module) }, \
#endif // MICROPY_INCLUDED_NRF_BOARD_MICROBIT_BOARD_MODULES_H

View File

@ -0,0 +1,16 @@
BOARD_MICROBIT_DIR = boards/microbit/modules
INC += -I./$(BOARD_MICROBIT_DIR)
CFLAGS += -DBOARD_SPECIFIC_MODULES
SRC_BOARD_MODULES = $(addprefix $(BOARD_MICROBIT_DIR)/,\
microbitdisplay.c \
microbitimage.c \
iters.c \
microbitconstimage.c \
microbitconstimagetuples.c \
modmicrobit.c \
)
OBJ += $(addprefix $(BUILD)/, $(SRC_BOARD_MODULES:.c=.o))

View File

@ -230,6 +230,13 @@ extern const struct _mp_obj_module_t random_module;
#define RANDOM_MODULE #define RANDOM_MODULE
#endif #endif
#if BOARD_SPECIFIC_MODULES
#include "board_modules.h"
#define MICROPY_BOARD_BUILTINS BOARD_MODULES
#else
#define MICROPY_BOARD_BUILTINS
#endif // BOARD_SPECIFIC_MODULES
#if BLUETOOTH_SD #if BLUETOOTH_SD
#if MICROPY_PY_BLE #if MICROPY_PY_BLE
@ -249,6 +256,7 @@ extern const struct _mp_obj_module_t ble_module;
MUSIC_MODULE \ MUSIC_MODULE \
UBLUEPY_MODULE \ UBLUEPY_MODULE \
RANDOM_MODULE \ RANDOM_MODULE \
MICROPY_BOARD_BUILTINS \
#else #else
@ -260,6 +268,7 @@ extern const struct _mp_obj_module_t ble_module;
{ MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \ { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
MUSIC_MODULE \ MUSIC_MODULE \
RANDOM_MODULE \ RANDOM_MODULE \
MICROPY_BOARD_BUILTINS \
#endif // BLUETOOTH_SD #endif // BLUETOOTH_SD
@ -299,6 +308,7 @@ extern const struct _mp_obj_module_t ble_module;
mp_obj_list_t mod_network_nic_list; \ mp_obj_list_t mod_network_nic_list; \
\ \
/* microbit modules */ \ /* microbit modules */ \
void *async_data[2]; \
struct _music_data_t *music_data; \ struct _music_data_t *music_data; \
const struct _pwm_events *pwm_active_events; \ const struct _pwm_events *pwm_active_events; \
const struct _pwm_events *pwm_pending_events; \ const struct _pwm_events *pwm_pending_events; \