Skip to content

Commit 889f465

Browse files
facchinmfacchinm
committed
core: restore core-as-zephyr-module functionality
1 parent df7e48b commit 889f465

File tree

12 files changed

+47
-13
lines changed

12 files changed

+47
-13
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
4+
35
if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD})
46
set(variant_dir variants/${BOARD})
5-
elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
6-
set(variant_dir variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
7+
elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${NORMALIZED_BOARD_TARGET})
8+
set(variant_dir variants/${NORMALIZED_BOARD_TARGET})
79
else()
8-
message(INFO "Variant dir not found: variants/${BOARD}, variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS}")
10+
message(FATAL_ERROR "Variant dir not found: variants/${BOARD}, variants/${NORMALIZED_BOARD_TARGET}")
911
endif()
1012

1113
if (CONFIG_ARDUINO_API)

‎cores/arduino/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ if(NOT DEFINED ARDUINO_BUILD_PATH)
66

77
zephyr_sources(zephyrSerial.cpp)
88
zephyr_sources(zephyrCommon.cpp)
9+
zephyr_sources(USB.cpp)
10+
zephyr_sources(itoa.cpp)
911

1012
if(DEFINED CONFIG_ARDUINO_ENTRY)
1113
zephyr_sources(main.cpp)

‎samples/analog_input/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(analog_input)

‎samples/attach_interrupt/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(attach_interrupt)

‎samples/blinky_arduino/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(blinky)

‎samples/button_press_led/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(blinky)

‎samples/fade/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(fade)

‎samples/hello_arduino/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(hello_world)

‎samples/i2cdemo/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(blinky)

‎samples/serial_event/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(serial_event)

0 commit comments

Comments
 (0)