Skip to content

Commit 1003aba

Browse files
committed
use board alias for pca10056
1 parent 13856af commit 1003aba

File tree

9 files changed

+15
-513
lines changed

9 files changed

+15
-513
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,5 @@ jobs:
156156

157157
- name: Build
158158
run: |
159-
west -v build -b pca10056 -d examples/device/cdc_msc/build examples/device/cdc_msc -- -DRTOS=zephyr
160-
west -v build -b pca10056 -d examples/device/msc_dual_lun/build examples/device/msc_dual_lun -- -DRTOS=zephyr
159+
west build -b pca10056 -d examples/device/cdc_msc/build examples/device/cdc_msc -- -DRTOS=zephyr
160+
west build -b pca10056 -d examples/device/msc_dual_lun/build examples/device/msc_dual_lun -- -DRTOS=zephyr

hw/bsp/family_support.cmake

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ if (NOT NO_WARN_RWX_SEGMENTS_SUPPORTED)
7979
set(NO_WARN_RWX_SEGMENTS_SUPPORTED 1)
8080
endif()
8181

82-
if (RTOS STREQUAL zephyr)
83-
set(BOARD_ROOT ${TOP}/hw/bsp/${FAMILY})
84-
cmake_print_variables(BOARD_ROOT BOARD)
85-
find_package(Zephyr REQUIRED HINTS ${TOP}/zephyr)
86-
endif ()
87-
8882
#-------------------------------------------------------------
8983
# Functions
9084
#-------------------------------------------------------------
@@ -604,7 +598,6 @@ function(family_flash_msp430flasher TARGET)
604598
)
605599
endfunction()
606600

607-
608601
function(family_flash_uniflash TARGET)
609602
if (NOT DEFINED DSLITE)
610603
set(DSLITE dslite.sh)
@@ -637,3 +630,12 @@ endif ()
637630

638631
# save it in case of re-inclusion
639632
set(FAMILY_MCUS ${FAMILY_MCUS} CACHE INTERNAL "")
633+
634+
#----------------------------------
635+
# Zephyr
636+
#----------------------------------
637+
if (RTOS STREQUAL zephyr)
638+
set(BOARD_ROOT ${TOP}/hw/bsp/${FAMILY})
639+
set(ZEPHYR_BOARD_ALIASES ${CMAKE_CURRENT_LIST_DIR}/zephyr_board_aliases.cmake)
640+
find_package(Zephyr REQUIRED HINTS ${TOP}/zephyr)
641+
endif ()

hw/bsp/nrf/boards/pca10056/zephyr/Kconfig.pca10056

Lines changed: 0 additions & 5 deletions
This file was deleted.

hw/bsp/nrf/boards/pca10056/zephyr/board.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

hw/bsp/nrf/boards/pca10056/zephyr/pca10056_nrf52840-pinctrl.dtsi

Lines changed: 0 additions & 187 deletions
This file was deleted.

0 commit comments

Comments
 (0)