Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Upgrade to Zephyr 1.14 LTS, update codebase for it #1900

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions arc/src/zjs_arc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion cmake/zjs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps/zephyr
Submodule zephyr updated 13266 files
2 changes: 0 additions & 2 deletions src/zjs_qemu_x86.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"targets": ["qemu_x86"],
"zephyr_conf": {
"qemu_x86": [
"CONFIG_RAM_SIZE=4096",
"CONFIG_ROM_SIZE=4092"
]
}
}