djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

address @tannewt changes: move and rename common files; remove PORT_HEAP_SIZE

This commit is contained in:
Dan Halbert 2019-02-15 20:32:32 -05:00
parent 72c03268a4
commit 7b3f7605b8
17 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/atmel-samd/Makefile
View File

@ -40,7 +40,7 @@ include boards/$(BOARD)/mpconfigboard.mk
# Port-specific
include mpconfigport.mk
# CircuitPython-specific
include $(TOP)/ports/circuitpy-common/mpconfig_circuitpy.mk
include $(TOP)/py/circuitpy_mpconfig.mk
# qstr definitions (must come before including py.mk)
QSTR_DEFS = qstrdefsport.h
@ -51,7 +51,7 @@ include $(TOP)/py/py.mk
include $(TOP)/supervisor/supervisor.mk
# Include make rules and variables common across CircuitPython builds.
include $(TOP)/ports/circuitpy-common/circuitpy_defns.mk
include $(TOP)/py/circuitpy_defns.mk
CROSS_COMPILE = arm-none-eabi-

5
ports/atmel-samd/mpconfigport.h
View File

@ -33,7 +33,6 @@
#ifdef SAMD21
#define CIRCUITPY_MCU_FAMILY samd21
#define MICROPY_PY_SYS_PLATFORM "Atmel SAMD21"
#define PORT_HEAP_SIZE (16384 + 4096)
#define SPI_FLASH_MAX_BAUDRATE 8000000
#define CIRCUITPY_DEFAULT_STACK_SIZE 4096
@ -64,8 +63,6 @@
#ifdef SAMD51
#define CIRCUITPY_MCU_FAMILY samd51
#define MICROPY_PY_SYS_PLATFORM "MicroChip SAMD51"
// 128KiB heap
#define PORT_HEAP_SIZE (0x20000)
#define SPI_FLASH_MAX_BAUDRATE 24000000
// 24kiB stack
#define CIRCUITPY_DEFAULT_STACK_SIZE 0x6000
@ -89,6 +86,6 @@
mp_obj_t playing_audio[AUDIO_DMA_CHANNEL_COUNT] \
;
#include "ports/circuitpy-common/mpconfig_circuitpy.h"
#include "py/circuitpy_mpconfig.h"
#endif // __INCLUDED_MPCONFIGPORT_H

4
ports/nrf/Makefile
View File

@ -46,7 +46,7 @@ include boards/$(BOARD)/mpconfigboard.mk
# Port-specific
include mpconfigport.mk
# CircuitPython-specific
include $(TOP)/ports/circuitpy-common/mpconfig_circuitpy.mk
include $(TOP)/py/circuitpy_mpconfig.mk
# qstr definitions (must come before including py.mk)
QSTR_DEFS = qstrdefsport.h
@ -57,7 +57,7 @@ include $(TOP)/py/py.mk
include $(TOP)/supervisor/supervisor.mk
# Include make rules and variables common across CircuitPython builds.
include $(TOP)/ports/circuitpy-common/circuitpy_defns.mk
include $(TOP)/py/circuitpy_defns.mk
ifneq ($(SD), )
include bluetooth/bluetooth_common.mk

3
ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h
View File

@ -55,9 +55,6 @@
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
// If you change this, then make sure to update the linker scripts as well to
// make sure you don't overwrite code
#define PORT_HEAP_SIZE (128 * 1024)
// TODO #define CIRCUITPY_INTERNAL_NVM_SIZE 8192
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

3
ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.h
View File

@ -42,9 +42,6 @@
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
// If you change this, then make sure to update the linker scripts as well to
// make sure you don't overwrite code
#define PORT_HEAP_SIZE (128 * 1024)
// TODO #define CIRCUITPY_INTERNAL_NVM_SIZE 8192
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

3
ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h
View File

@ -35,9 +35,6 @@
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
// If you change this, then make sure to update the linker scripts as well to
// make sure you don't overwrite code
#define PORT_HEAP_SIZE (128 * 1024)
// TODO #define CIRCUITPY_INTERNAL_NVM_SIZE 8192
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

3
ports/nrf/boards/particle_argon/mpconfigboard.h
View File

@ -57,9 +57,6 @@
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
// If you change this, then make sure to update the linker scripts as well to
// make sure you don't overwrite code
#define PORT_HEAP_SIZE (128 * 1024)
// TODO #define CIRCUITPY_INTERNAL_NVM_SIZE 8192
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

3
ports/nrf/boards/particle_boron/mpconfigboard.h
View File

@ -57,9 +57,6 @@
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
// If you change this, then make sure to update the linker scripts as well to
// make sure you don't overwrite code
#define PORT_HEAP_SIZE (128 * 1024)
// TODO #define CIRCUITPY_INTERNAL_NVM_SIZE 8192
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

3
ports/nrf/boards/particle_xenon/mpconfigboard.h
View File

@ -57,9 +57,6 @@
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
// If you change this, then make sure to update the linker scripts as well to
// make sure you don't overwrite code
#define PORT_HEAP_SIZE (128 * 1024)
// TODO #define CIRCUITPY_INTERNAL_NVM_SIZE 8192
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)

1
ports/nrf/boards/pca10056/mpconfigboard.h
View File

@ -30,7 +30,6 @@
#define MICROPY_HW_MCU_NAME "nRF52840"
#define MICROPY_PY_SYS_PLATFORM "nRF52840-DK"
#define PORT_HEAP_SIZE (128 * 1024)
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
#define MICROPY_HW_LED_STATUS (&pin_P0_13)

1
ports/nrf/boards/pca10059/mpconfigboard.h
View File

@ -30,5 +30,4 @@
#define MICROPY_HW_LED_STATUS (&pin_P0_06)
#define PORT_HEAP_SIZE (128 * 1024)
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500

2
ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.h
View File

@ -30,7 +30,6 @@
#define MICROPY_HW_MCU_NAME "nRF52840"
#define MICROPY_PY_SYS_PLATFORM "SFE_NRF52840_Mini"
#define PORT_HEAP_SIZE (128 * 1024)
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
#define DEFAULT_I2C_BUS_SCL (&pin_P0_11)
@ -65,4 +64,3 @@
#define SPI_FLASH_SCK_PIN &pin_P0_19
#define SPI_FLASH_CS_PIN &pin_P0_17
#endif*/

2
ports/nrf/mpconfigport.h
View File

@ -56,6 +56,6 @@
CIRCUITPY_COMMON_ROOT_POINTERS \
;
#include "ports/circuitpy-common/mpconfig_circuitpy.h"
#include "py/circuitpy_mpconfig.h"
#endif // NRF5_MPCONFIGPORT_H__

0
ports/circuitpy-common/circuitpy_defns.mk → py/circuitpy_defns.mk
View File

0
ports/circuitpy-common/mpconfig_circuitpy.h → py/circuitpy_mpconfig.h
View File

26
ports/circuitpy-common/mpconfig_circuitpy.mk → py/circuitpy_mpconfig.mk
View File

@ -1,3 +1,29 @@
#
# This file is part of the MicroPython project, http://micropython.org/
#
# The MIT License (MIT)
#
# Copyright (c) 2019 Dan Halbert for Adafruit Industries
#
# 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.
# mpconfigboard.mk files can specify:
# CIRCUITPY_FULL_BUILD = 1 (which is the default)
# or

4
supervisor/port.h
View File

@ -29,10 +29,6 @@
#include "py/mpconfig.h"
#ifndef PORT_HEAP_SIZE
#error "Please define PORT_HEAP_SIZE to specify heap size in bytes."
#endif
#include "supervisor/shared/safe_mode.h"
// Provided by the linker;