From 35d09a7b1922dfee996e82fc52ec1250be564d0a Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 1 May 2026 11:56:31 +1000 Subject: [PATCH] zephyr/boards/xiao_ble_nrf52840_sense: Use conf to select feature level. Signed-off-by: Damien George --- .../boards/xiao_ble_nrf52840_sense.conf | 13 ++++----- .../xiao_ble_nrf52840_sense/mpconfigport.h | 27 ------------------- 2 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h diff --git a/ports/zephyr/boards/xiao_ble_nrf52840_sense.conf b/ports/zephyr/boards/xiao_ble_nrf52840_sense.conf index 541ade2af2..9544bd9104 100644 --- a/ports/zephyr/boards/xiao_ble_nrf52840_sense.conf +++ b/ports/zephyr/boards/xiao_ble_nrf52840_sense.conf @@ -21,7 +21,6 @@ CONFIG_BT_L2CAP_TX_MTU=252 CONFIG_BT_BUF_ACL_RX_SIZE=256 CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n -CONFIG_MICROPY_HEAP_SIZE=98304 CONFIG_MAIN_STACK_SIZE=8192 # Enable drivers for peripherals @@ -37,10 +36,6 @@ CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_DISK_ACCESS=n -CONFIG_MICROPY_FROZEN_MODULES=y -CONFIG_MICROPY_FROZEN_MANIFEST="boards/xiao_ble_nrf52840_sense/manifest.py" -CONFIG_MICROPY_CONFIGFILE="boards/xiao_ble_nrf52840_sense/mpconfigport.h" - # CONFIG_DYNAMIC_THREAD=y CONFIG_THREAD_CUSTOM_DATA=y CONFIG_THREAD_MONITOR=y @@ -48,4 +43,10 @@ CONFIG_THREAD_STACK_INFO=y CONFIG_LOG=n CONFIG_FP16=n -CONFIG_BOOT_BANNER=n \ No newline at end of file +CONFIG_BOOT_BANNER=n + +# MicroPython config. +CONFIG_MICROPY_HEAP_SIZE=98304 +CONFIG_MICROPY_FROZEN_MODULES=y +CONFIG_MICROPY_FROZEN_MANIFEST="boards/xiao_ble_nrf52840_sense/manifest.py" +CONFIG_MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES=y diff --git a/ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h b/ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h deleted file mode 100644 index 03ec9206fc..0000000000 --- a/ports/zephyr/boards/xiao_ble_nrf52840_sense/mpconfigport.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * 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. - */ - -#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES) - -#include "../mpconfigport.h"