From 5eb94df09ec5964822b9de64d6430de16901562d Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 3 Jul 2025 11:15:36 +1000 Subject: [PATCH] zephyr/prj.conf: Use UART for console as default, not CONSOLE_SUBSYS. Most boards enable the UART console because it's needed for USB (where USB CDC creates a virtual UART), and for ctrl-C to work. The `prj_minimal.conf` settings still use CONSOLE_SUBSYS. Fixes issue #17608. Signed-off-by: Damien George --- ports/zephyr/boards/bbc_microbit_v2.conf | 1 - ports/zephyr/boards/nucleo_h743zi.conf | 3 --- ports/zephyr/boards/nucleo_wb55rg.conf | 1 - ports/zephyr/boards/qemu_cortex_m3.conf | 4 ---- ports/zephyr/boards/qemu_x86.conf | 4 ---- ports/zephyr/prj.conf | 5 ----- ports/zephyr/prj_minimal.conf | 3 --- 7 files changed, 21 deletions(-) diff --git a/ports/zephyr/boards/bbc_microbit_v2.conf b/ports/zephyr/boards/bbc_microbit_v2.conf index 31872244c..43742078f 100644 --- a/ports/zephyr/boards/bbc_microbit_v2.conf +++ b/ports/zephyr/boards/bbc_microbit_v2.conf @@ -1,4 +1,3 @@ -CONFIG_CONSOLE_SUBSYS=n CONFIG_NETWORKING=n CONFIG_BT=y CONFIG_BT_DEVICE_NAME_DYNAMIC=y diff --git a/ports/zephyr/boards/nucleo_h743zi.conf b/ports/zephyr/boards/nucleo_h743zi.conf index 942415b79..ea6a60b35 100644 --- a/ports/zephyr/boards/nucleo_h743zi.conf +++ b/ports/zephyr/boards/nucleo_h743zi.conf @@ -1,6 +1,3 @@ -# disable console subsys to get REPL working -CONFIG_CONSOLE_SUBSYS=n - # flash config CONFIG_FLASH=y CONFIG_FLASH_MAP=y diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf index baf0f2807..fab993676 100644 --- a/ports/zephyr/boards/nucleo_wb55rg.conf +++ b/ports/zephyr/boards/nucleo_wb55rg.conf @@ -1,4 +1,3 @@ -CONFIG_CONSOLE_SUBSYS=n CONFIG_NETWORKING=n CONFIG_BT=y CONFIG_BT_DEVICE_NAME_DYNAMIC=y diff --git a/ports/zephyr/boards/qemu_cortex_m3.conf b/ports/zephyr/boards/qemu_cortex_m3.conf index 50d0c4d92..11eebd960 100644 --- a/ports/zephyr/boards/qemu_cortex_m3.conf +++ b/ports/zephyr/boards/qemu_cortex_m3.conf @@ -1,7 +1,3 @@ -# Interrupt-driven UART console has emulation artifacts under QEMU, -# disable it -CONFIG_CONSOLE_SUBSYS=n - # This QEMU target only has 256k ROM and 64k RAM, so disable networking CONFIG_NETWORKING=n diff --git a/ports/zephyr/boards/qemu_x86.conf b/ports/zephyr/boards/qemu_x86.conf index 35461025a..1d04675df 100644 --- a/ports/zephyr/boards/qemu_x86.conf +++ b/ports/zephyr/boards/qemu_x86.conf @@ -1,7 +1,3 @@ -# Interrupt-driven UART console has emulation artifacts under QEMU, -# disable it -CONFIG_CONSOLE_SUBSYS=n - # Networking drivers # SLIP driver for QEMU CONFIG_NET_SLIP_TAP=y diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf index 7b7513abd..011cb72cf 100644 --- a/ports/zephyr/prj.conf +++ b/ports/zephyr/prj.conf @@ -6,11 +6,6 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_CONSOLE_HANDLER=y CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y -CONFIG_CONSOLE_SUBSYS=y -CONFIG_CONSOLE_GETCHAR=y -CONFIG_CONSOLE_GETCHAR_BUFSIZE=258 -CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128 - CONFIG_NEWLIB_LIBC=y CONFIG_FPU=y CONFIG_MAIN_STACK_SIZE=4736 diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf index 6c850751d..3f9acc655 100644 --- a/ports/zephyr/prj_minimal.conf +++ b/ports/zephyr/prj_minimal.conf @@ -8,8 +8,5 @@ CONFIG_CONSOLE_SUBSYS=y CONFIG_CONSOLE_GETCHAR=y CONFIG_CONSOLE_GETCHAR_BUFSIZE=258 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=32 -# TODO: Disable once https://github.com/zephyrproject-rtos/zephyr/pull/13731 is merged -#CONFIG_CONSOLE=n -#CONFIG_UART_CONSOLE=n CONFIG_MICROPY_HEAP_SIZE=16384