xenua
/
zmk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

refactor(boards): Use Zephyr UF2 generation.

xmkb
Peter Johanson 2 years ago committed by Pete Johanson
parent
cc51562f78
commit
4eb8f8cd23
20 changed files with 12 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      app/boards/arm/bluemicro840/CMakeLists.txt
  2. 1
      app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
  3. 8
      app/boards/arm/bt60/CMakeLists.txt
  4. 1
      app/boards/arm/bt60/bt60_v1_defconfig
  5. 1
      app/boards/arm/bt60/bt60_v1_hs_defconfig
  6. 8
      app/boards/arm/mikoto/CMakeLists.txt
  7. 1
      app/boards/arm/mikoto/mikoto_520_defconfig
  8. 8
      app/boards/arm/nice60/CMakeLists.txt
  9. 1
      app/boards/arm/nice60/nice60_defconfig
  10. 8
      app/boards/arm/nice_nano/CMakeLists.txt
  11. 1
      app/boards/arm/nice_nano/nice_nano_defconfig
  12. 1
      app/boards/arm/nice_nano/nice_nano_v2_defconfig
  13. 11
      app/boards/arm/nrf52840_m2/CMakeLists.txt
  14. 1
      app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
  15. 8
      app/boards/arm/nrfmicro/CMakeLists.txt
  16. 1
      app/boards/arm/nrfmicro/nrfmicro_11_defconfig
  17. 1
      app/boards/arm/nrfmicro/nrfmicro_11_flipped_defconfig
  18. 1
      app/boards/arm/nrfmicro/nrfmicro_13_defconfig
  19. 8
      app/boards/arm/s40nc/CMakeLists.txt
  20. 1
      app/boards/arm/s40nc/s40nc_defconfig

8
app/boards/arm/bluemicro840/CMakeLists.txt
Unescape View File

@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x26000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)

1
app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
Unescape View File

@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y @@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

8
app/boards/arm/bt60/CMakeLists.txt
Unescape View File

@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x26000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)

1
app/boards/arm/bt60/bt60_v1_defconfig
Unescape View File

@ -15,6 +15,7 @@ CONFIG_EC11=y @@ -15,6 +15,7 @@ CONFIG_EC11=y
CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

1
app/boards/arm/bt60/bt60_v1_hs_defconfig
Unescape View File

@ -15,6 +15,7 @@ CONFIG_EC11=y @@ -15,6 +15,7 @@ CONFIG_EC11=y
CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

8
app/boards/arm/mikoto/CMakeLists.txt
Unescape View File

@ -1,11 +1,3 @@ @@ -1,11 +1,3 @@
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x26000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)
if(CONFIG_PINMUX)
zephyr_library()

1
app/boards/arm/mikoto/mikoto_520_defconfig
Unescape View File

@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y @@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

8
app/boards/arm/nice60/CMakeLists.txt
Unescape View File

@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x1000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)

1
app/boards/arm/nice60/nice60_defconfig
Unescape View File

@ -12,6 +12,7 @@ CONFIG_ARM_MPU=y @@ -12,6 +12,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

8
app/boards/arm/nice_nano/CMakeLists.txt
Unescape View File

@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x26000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)

1
app/boards/arm/nice_nano/nice_nano_defconfig
Unescape View File

@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y @@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

1
app/boards/arm/nice_nano/nice_nano_v2_defconfig
Unescape View File

@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y @@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

11
app/boards/arm/nrf52840_m2/CMakeLists.txt
Unescape View File

@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x26000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)

1
app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
Unescape View File

@ -12,6 +12,7 @@ CONFIG_ARM_MPU=y @@ -12,6 +12,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

8
app/boards/arm/nrfmicro/CMakeLists.txt
Unescape View File

@ -1,11 +1,3 @@ @@ -1,11 +1,3 @@
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x26000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)
if(CONFIG_PINMUX)
zephyr_library()

1
app/boards/arm/nrfmicro/nrfmicro_11_defconfig
Unescape View File

@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y @@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

1
app/boards/arm/nrfmicro/nrfmicro_11_flipped_defconfig
Unescape View File

@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y @@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

1
app/boards/arm/nrfmicro/nrfmicro_13_defconfig
Unescape View File

@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y @@ -11,6 +11,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

8
app/boards/arm/s40nc/CMakeLists.txt
Unescape View File

@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c
-b 0x1000
-f 0xADA52840
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
)

1
app/boards/arm/s40nc/s40nc_defconfig
Unescape View File

@ -12,6 +12,7 @@ CONFIG_ARM_MPU=y @@ -12,6 +12,7 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_BUILD_OUTPUT_UF2=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y
CONFIG_NVS=y

Write Preview
Loading…
Cancel
Save