summaryrefslogtreecommitdiff
path: root/app/boards/arm
diff options
context:
space:
mode:
Diffstat (limited to 'app/boards/arm')
-rw-r--r--app/boards/arm/nice_nano/Kconfig6
-rw-r--r--app/boards/arm/nice_nano/Kconfig.board1
-rw-r--r--app/boards/arm/nice_nano/board.cmake2
-rw-r--r--app/boards/arm/planck/planck_rev6.keymap16
-rw-r--r--app/boards/arm/proton_c/CMakeLists.txt2
-rw-r--r--app/boards/arm/proton_c/pinmux.c2
6 files changed, 12 insertions, 17 deletions
diff --git a/app/boards/arm/nice_nano/Kconfig b/app/boards/arm/nice_nano/Kconfig
new file mode 100644
index 0000000..a190425
--- /dev/null
+++ b/app/boards/arm/nice_nano/Kconfig
@@ -0,0 +1,6 @@
+
+config BOARD_ENABLE_DCDC
+ bool "Enable DCDC mode"
+ select SOC_DCDC_NRF52X
+ default y
+ depends on BOARD_NICE_NANO
diff --git a/app/boards/arm/nice_nano/Kconfig.board b/app/boards/arm/nice_nano/Kconfig.board
index 60ee58b..4fd394f 100644
--- a/app/boards/arm/nice_nano/Kconfig.board
+++ b/app/boards/arm/nice_nano/Kconfig.board
@@ -6,3 +6,4 @@
config BOARD_NICE_NANO
bool "nice!nano"
depends on SOC_NRF52840_QIAA
+
diff --git a/app/boards/arm/nice_nano/board.cmake b/app/boards/arm/nice_nano/board.cmake
index 12a1d93..fa847d5 100644
--- a/app/boards/arm/nice_nano/board.cmake
+++ b/app/boards/arm/nice_nano/board.cmake
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
diff --git a/app/boards/arm/planck/planck_rev6.keymap b/app/boards/arm/planck/planck_rev6.keymap
index f474ec9..af1dc7c 100644
--- a/app/boards/arm/planck/planck_rev6.keymap
+++ b/app/boards/arm/planck/planck_rev6.keymap
@@ -1,23 +1,11 @@
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/matrix-transform.h>
/ {
- chosen {
- zmk,keymap = &keymap0;
- };
-
- keymap0: keymap {
+ keymap {
compatible = "zmk,keymap";
- label ="Default Planck Keymap";
- layers = <&default>;
- };
-
- layers {
- compatible = "zmk,layers";
- default: layer_0 {
- label = "DEFAULT";
+ default_layer {
// -----------------------------------------------------------------------------------------
// | TAB | Q | W | E | R | T | Y | U | I | O | P | BSPC |
// | ESC | A | S | D | F | G | H | J | K | L | ; | ' |
diff --git a/app/boards/arm/proton_c/CMakeLists.txt b/app/boards/arm/proton_c/CMakeLists.txt
index d1b8108..940af1f 100644
--- a/app/boards/arm/proton_c/CMakeLists.txt
+++ b/app/boards/arm/proton_c/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
if(CONFIG_PINMUX)
zephyr_library()
diff --git a/app/boards/arm/proton_c/pinmux.c b/app/boards/arm/proton_c/pinmux.c
index 09f3a34..a6aaae0 100644
--- a/app/boards/arm/proton_c/pinmux.c
+++ b/app/boards/arm/proton_c/pinmux.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2017 I-SENSE group of ICCS
*
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: MIT
*/
#include <kernel.h>