From a12adce1305ce95363f0b44eb598fd89c6d139fb Mon Sep 17 00:00:00 2001 From: Daniel Kampert Date: Wed, 7 Aug 2024 09:46:58 +0200 Subject: [PATCH] Remove double entry, remove UART disabling for rev >3 because it is disabled in DT, add it to board config for rev 1 and 2 --- app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_1.conf | 4 +++- app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_2.conf | 4 +++- app/prj.conf | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_1.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_1.conf index 9760a94b..f13ff201 100644 --- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_1.conf +++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_1.conf @@ -1 +1,3 @@ -CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y \ No newline at end of file +CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y + +CONFIG_UART_CONSOLE=n \ No newline at end of file diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_2.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_2.conf index 9760a94b..f13ff201 100644 --- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_2.conf +++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_2.conf @@ -1 +1,3 @@ -CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y \ No newline at end of file +CONFIG_DEBUG_COREDUMP_BACKEND_LOGGING=y + +CONFIG_UART_CONSOLE=n \ No newline at end of file diff --git a/app/prj.conf b/app/prj.conf index 08977af3..0222ed34 100644 --- a/app/prj.conf +++ b/app/prj.conf @@ -67,7 +67,6 @@ CONFIG_LV_USE_ROLLER=n CONFIG_LV_USE_SLIDER=y CONFIG_LV_USE_SWITCH=y CONFIG_LV_USE_TABLE=n -CONFIG_LV_USE_TEXTAREA=n CONFIG_LV_USE_FLEX=y CONFIG_LV_USE_ANIMIMG=y CONFIG_LV_USE_CALENDAR=n @@ -160,7 +159,6 @@ CONFIG_POSIX_API=y # By default disable UART to save power CONFIG_SERIAL=n CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n CONFIG_ZBUS=y CONFIG_ZBUS_RUNTIME_OBSERVERS=y