From 00a7114dd1be2e272e4cb37356bb8cedfccd84be Mon Sep 17 00:00:00 2001 From: rbaron Date: Sun, 27 Nov 2022 18:56:47 +0100 Subject: [PATCH] Extracts boards/ and dts/ to prstlib --- .../ble => prstlib}/boards/arm/bparasite_nrf52840/Kconfig | 0 .../boards/arm/bparasite_nrf52840/Kconfig.board | 0 .../boards/arm/bparasite_nrf52840/Kconfig.defconfig | 0 .../ble => prstlib}/boards/arm/bparasite_nrf52840/board.cmake | 0 .../arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi | 0 .../boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts | 0 .../arm/bparasite_nrf52840/bparasite_nrf52840_defconfig | 0 .../boards/arm/bparasite_nrf52840/pre_dt_board.cmake | 0 .../{samples/ble => prstlib}/dts/bindings/pwm-fixed.yaml | 0 code/nrf-connect/samples/ble/CMakeLists.txt | 4 ++++ code/nrf-connect/samples/ble/prj.conf | 2 +- 11 files changed, 5 insertions(+), 1 deletion(-) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/Kconfig (100%) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/Kconfig.board (100%) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/Kconfig.defconfig (100%) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/board.cmake (100%) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi (100%) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts (100%) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig (100%) rename code/nrf-connect/{samples/ble => prstlib}/boards/arm/bparasite_nrf52840/pre_dt_board.cmake (100%) rename code/nrf-connect/{samples/ble => prstlib}/dts/bindings/pwm-fixed.yaml (100%) diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/Kconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/Kconfig rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/Kconfig.board b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig.board similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/Kconfig.board rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig.board diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/Kconfig.defconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig.defconfig similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/Kconfig.defconfig rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig.defconfig diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/board.cmake b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/board.cmake similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/board.cmake rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/board.cmake diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840-pinctrl.dtsi diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig diff --git a/code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/pre_dt_board.cmake b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/pre_dt_board.cmake similarity index 100% rename from code/nrf-connect/samples/ble/boards/arm/bparasite_nrf52840/pre_dt_board.cmake rename to code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/pre_dt_board.cmake diff --git a/code/nrf-connect/samples/ble/dts/bindings/pwm-fixed.yaml b/code/nrf-connect/prstlib/dts/bindings/pwm-fixed.yaml similarity index 100% rename from code/nrf-connect/samples/ble/dts/bindings/pwm-fixed.yaml rename to code/nrf-connect/prstlib/dts/bindings/pwm-fixed.yaml diff --git a/code/nrf-connect/samples/ble/CMakeLists.txt b/code/nrf-connect/samples/ble/CMakeLists.txt index bc83d32..65e5cf4 100644 --- a/code/nrf-connect/samples/ble/CMakeLists.txt +++ b/code/nrf-connect/samples/ble/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 3.20.0) +# Pull in the dts/ and boards/ from prstlib. +set(DTS_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../prstlib) +set(BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../prstlib) + find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(ble) diff --git a/code/nrf-connect/samples/ble/prj.conf b/code/nrf-connect/samples/ble/prj.conf index ce61e97..0a748eb 100644 --- a/code/nrf-connect/samples/ble/prj.conf +++ b/code/nrf-connect/samples/ble/prj.conf @@ -1,5 +1,5 @@ # Enabling log has a big impact in power consumption. Only enable it while debugging. -CONFIG_LOG=y +CONFIG_LOG=n CONFIG_PWM=y CONFIG_CBPRINTF_FP_SUPPORT=y CONFIG_I2C=y