From fb24e06178bd4b5acb3beb11fb14e139a620e9c5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Mar 2019 22:49:28 +0200 Subject: [PATCH 1/5] deps/zephyr: Update to v1.14.0. Signed-off-by: Paul Sokolovsky --- deps/zephyr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/zephyr b/deps/zephyr index 00ba8c339..cebe11544 160000 --- a/deps/zephyr +++ b/deps/zephyr @@ -1 +1 @@ -Subproject commit 00ba8c339afd89d09e732d1679b8a38f481cdb7a +Subproject commit cebe11544ebeaed9a0c9ffd722c1639fa7463cbe From 0cac9dd1fe7f6344ce006f7ecdc5e682af114742 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Mar 2019 22:45:11 +0200 Subject: [PATCH 2/5] cmake/zjs.cmake: Use PUBLIC keyword in target_link_libraries Required as of Zephyr 1.14. Signed-off-by: Paul Sokolovsky --- cmake/zjs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/zjs.cmake b/cmake/zjs.cmake index 953b95d20..4ee1c97d2 100644 --- a/cmake/zjs.cmake +++ b/cmake/zjs.cmake @@ -86,7 +86,7 @@ target_include_directories(app PRIVATE ${APP_INCLUDES}) target_sources(app PRIVATE ${APP_SRC}) -target_link_libraries(app jerry-core jerry-ext) +target_link_libraries(app PUBLIC jerry-core jerry-ext) include(cmake/jerry.cmake) # additional configuration will be generated by analyze script From a81bb98c36eec4af2abf3e9a692c42e872843801 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Mar 2019 22:45:45 +0200 Subject: [PATCH 3/5] src/zjs_qemu_x86.json: Remove CONFIG_RAM_SIZE/CONFIG_ROM_SIZE No longer available in Zephyr 1.14, cause build failure. Signed-off-by: Paul Sokolovsky --- src/zjs_qemu_x86.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/zjs_qemu_x86.json b/src/zjs_qemu_x86.json index 56540d9ea..a6f36e555 100644 --- a/src/zjs_qemu_x86.json +++ b/src/zjs_qemu_x86.json @@ -3,8 +3,6 @@ "targets": ["qemu_x86"], "zephyr_conf": { "qemu_x86": [ - "CONFIG_RAM_SIZE=4096", - "CONFIG_ROM_SIZE=4092" ] } } From 793dc295567a3647d6b8271ca8ee50a80f05cd7b Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Mar 2019 13:46:42 +0200 Subject: [PATCH 4/5] arc/src/zjs_arc.json: Remove CONFIG_NS16550=n. CONFIG_NS16550 is no longer in Zephyr 1.14, references lead to build breakage. Signed-off-by: Paul Sokolovsky --- arc/src/zjs_arc.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arc/src/zjs_arc.json b/arc/src/zjs_arc.json index c979188e3..5f96cf8bf 100644 --- a/arc/src/zjs_arc.json +++ b/arc/src/zjs_arc.json @@ -6,8 +6,7 @@ "CONFIG_STDOUT_CONSOLE=y", "CONFIG_PRINTK=y", "CONFIG_CONSOLE=y", - "CONFIG_SERIAL=n", - "CONFIG_NS16550=n" + "CONFIG_SERIAL=n" ] }, "src": ["../src/zjs_common.c"] From 3ea07468a7a2ed88482cef275c5b03ae2806425c Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Mar 2019 13:47:26 +0200 Subject: [PATCH 5/5] Makefile: Don't add CONFIG_RAM_SIZE/ROM_SIZE to config. No longer in Zephyr 1.14, lead to build breakage. Signed-off-by: Paul Sokolovsky --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 853420b6f..3da8b113b 100644 --- a/Makefile +++ b/Makefile @@ -347,8 +347,8 @@ ifeq ($(OS), Darwin) @# support iamcu instruction set on the Arduino 101 @echo "CONFIG_X86_IAMCU=n" >> prj.conf endif - @echo "CONFIG_RAM_SIZE=$(RAM)" >> prj.conf - @echo "CONFIG_ROM_SIZE=$(ROM)" >> prj.conf +# @echo "CONFIG_RAM_SIZE=$(RAM)" >> prj.conf +# @echo "CONFIG_ROM_SIZE=$(ROM)" >> prj.conf @printf "CONFIG_SS_RESET_VECTOR=0x400%x\n" $$((($(ROM) + 64) * 1024)) >> prj.conf @echo "&flash0 { reg = <0x40010000 ($(ROM) * 1024)>; };" > arduino_101.overlay @echo "&flash1 { reg = <0x40030000 ($(ROM) * 1024)>; };" >> arduino_101.overlay