Update Zephyr RTOS port for Zephyr 1.10 release #2120

pfalcon · 2017-11-23T10:46:02Z

Zephyr 1.10 has switched to CMake-based build system (kind of like JerryScript, but the best way to think about it is of course as "different CMake-based build system").

Besides updating for new build system, the patch also removes some old stuff and updates for other changes in Zephyr.

pfalcon · 2017-11-23T10:46:48Z

Note that this shouldn't be merged before the official 1.10 release (ETA is beginning of December).

pfalcon · 2017-11-23T10:49:16Z

@SebastianBoe, @grgustaf, @jimmy-huang, @poussa : FYI.

SebastianBoe · 2017-11-23T12:36:48Z

targets/zephyr/CMakeLists.txt

+  COMMAND echo Z_CFLAGS=${system_includes}${includes}${definitions}${options}
+  COMMAND echo NOSTDINC_FLAGS=${system_includes}
+  COMMAND echo ZEPHYRINCLUDE=${includes}
+  COMMAND echo KBUILD_CFLAGS=${definitions}${options}


Glad to see that this worked :)

pfalcon · 2017-11-27T17:44:21Z

Update: Makefile.zephyr was updated, CI now passes.

pfalcon · 2017-11-29T15:50:22Z

@akosthekiss : Can you please review Makefile.travis changes (as updating your #2102) ?

pfalcon · 2017-12-06T13:56:51Z

Updated for latest changes in Zephyr build system.

pfalcon · 2017-12-12T11:36:14Z

Zephyr 1.10 has been released, so this is ready for merge now.

@akosthekiss, @yichoi, @LaszloLango, @dbatyai : Can you please review?

LaszloLango · 2017-12-12T12:50:57Z

targets/zephyr/CMakeLists.txt

@@ -0,0 +1,31 @@
+include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)


Please add the license header.

LaszloLango · 2017-12-12T12:51:11Z

targets/zephyr/CMakeLists.txt

+target_link_libraries(app jerry-core jerry-ext)
+
+
+


Too many empty lines.

LaszloLango · 2017-12-12T12:53:09Z

targets/zephyr/CMakeLists.txt

+set_target_properties(jerry-core PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/../obj/lib/libjerry-core.a)
+set_target_properties(jerry-core PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/../../jerry-core/include)
+set_target_properties(jerry-ext PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/../obj/lib/libjerry-ext.a)
+set_target_properties(jerry-ext PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/../../jerry-ext/include)


These set_target_properties lines are quite long. What about wrapping them?

For example:

set_target_properties(jerry-ext PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/../../jerry-ext/include)

LaszloLango · 2017-12-12T12:55:09Z

targets/zephyr/Makefile.travis


 # Fetch Zephyr Project repository and install python dependencies.
 install-zephyr: install-apt-get-deps
-	git clone https://github.com/zephyrproject-rtos/zephyr.git ../zephyr -b zephyr-v1.9.1
+	git clone https://github.com/zephyrproject-rtos/zephyr.git ../zephyr -b v1.10-branch


Will this branch live forever? IMHO it will be better to use the release tag and not the branch.

This branch would transition thru 1.10.x point releases, and the idea was to check that JrS remains buildable with them, but as you wish, switching to the tag.

LaszloLango · 2017-12-12T12:56:28Z

Nice patch, I have just a few minor comments.

In 1.10, Zephyr RTOS switched to CMake as means to generate application makefiles. Consequently, drop Makefile, and introduce CMakeLists.txt, and update master Makefile.zephyr accordingly. With these changes, take a chance to make following "cosmetic" changes: 1. Make "qemu_x86" board target the default instead of "arduino_101". Arduino 101 is just one of the boards of many supported by Zephyr (and thus JerryScript port), while qemu_x86 is something everyone has. 2. Zephyr make target to run QEMU switched from "qemu" to "run". 3. Don't rely that there's zephyr.strip, it's presence is now board-dependent. The most we can rely on is zephyr.elf. JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org

MDEF files have been deprecated and ignored for few Zephyr releases. JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org

qemu_x86 target now has stack guard enabled by default and it trips with the default stack size. Set it to 2K for now. JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org

Zephyr 1.10 requires SDK 0.9.2 and CMake 3.8.2. Also, don't hardcode CC path, it depends on a board and choosed automatically by Zephyr build system. JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org

LaszloLango

LGTM, but please squash the commits with an appropriate commit message.

pfalcon · 2017-12-21T19:45:11Z

LGTM, but please squash the commits with an appropriate commit message.

Thanks! Originally, these commits were intended to be separate. If your request them to be squashed, let me do that in the separate PR: #2155

pfalcon mentioned this pull request Nov 23, 2017

Reintroduce generic "outputexports" target after CMake migration zephyrproject-rtos/zephyr#4917

Closed

4 tasks

SebastianBoe reviewed Nov 23, 2017

View reviewed changes

pfalcon force-pushed the zephyr-1.10-cmake branch 4 times, most recently from f962b5b to ecd19dd Compare November 27, 2017 16:04

pfalcon force-pushed the zephyr-1.10-cmake branch 3 times, most recently from 4929b56 to 3b6a073 Compare December 6, 2017 13:40

pfalcon force-pushed the zephyr-1.10-cmake branch 2 times, most recently from 410ff5e to 5595101 Compare December 12, 2017 10:32

pfalcon changed the title ~~[RFC][WIP] Update Zephyr RTOS port for the upcoming Zephyr 1.10 release~~ Update Zephyr RTOS port for Zephyr 1.10 release Dec 12, 2017

LaszloLango requested changes Dec 12, 2017

View reviewed changes

pfalcon added 4 commits December 12, 2017 18:34

targets: zephyr: Remove deprecated prj.mdef file.

52ec9bb

MDEF files have been deprecated and ignored for few Zephyr releases. JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org

targets: zephyr: Increase main (i.e. interpreter) thread stack size.

a788c53

qemu_x86 target now has stack guard enabled by default and it trips with the default stack size. Set it to 2K for now. JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org

targets: zephyr: Makefile.travis: Update for Zephyr 1.10.

1a85619

Zephyr 1.10 requires SDK 0.9.2 and CMake 3.8.2. Also, don't hardcode CC path, it depends on a board and choosed automatically by Zephyr build system. JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org

pfalcon force-pushed the zephyr-1.10-cmake branch from 5595101 to 1a85619 Compare December 12, 2017 16:38

LaszloLango approved these changes Dec 12, 2017

View reviewed changes

pfalcon mentioned this pull request Dec 21, 2017

Update Zephyr RTOS port for Zephyr 1.10 release (squashed) #2155

Merged

pfalcon closed this Dec 21, 2017

		@@ -0,0 +1,31 @@
		include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)

Update Zephyr RTOS port for Zephyr 1.10 release #2120

Update Zephyr RTOS port for Zephyr 1.10 release #2120

Uh oh!

Conversation

pfalcon commented Nov 23, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pfalcon commented Nov 23, 2017

Uh oh!

pfalcon commented Nov 23, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pfalcon commented Nov 27, 2017

Uh oh!

pfalcon commented Nov 29, 2017

Uh oh!

pfalcon commented Dec 6, 2017

Uh oh!

pfalcon commented Dec 12, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LaszloLango commented Dec 12, 2017

Uh oh!

LaszloLango left a comment

Choose a reason for hiding this comment

Uh oh!

pfalcon commented Dec 21, 2017

Uh oh!

Uh oh!

pfalcon commented Nov 23, 2017 •

edited

Loading