Update the nuttx-stm32f4 target

Zsolt Borbély · Zsolt Borbély · commit 1e82ae1eb5b9 · 2016-08-26T15:38:14.000+02:00
Related issue: #1202 JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély zsborbely.u-szeged@partner.samsung.com
diff --git a/targets/nuttx-stm32f4/Kconfig b/targets/nuttx-stm32f4/Kconfig
@@ -0,0 +1,34 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config JERRYSCRIPT
+	bool "Jerryscript"
+	default n
+	---help---
+		Enable Jerryscript ECMAScript 5.1 interpreter
+
+if JERRYSCRIPT
+
+config JERRYSCRIPT_PROGNAME
+	string "Program name"
+	default "jerry"
+	depends on BUILD_KERNEL
+	---help---
+		This is the name of the program that will be
+		 use when the NSH ELF program is installed.
+
+config JERRYSCRIPT_PRIORITY
+	int "Jerryscript task priority"
+	default 100
+
+config JERRYSCRIPT_STACKSIZE
+	int "Jerryscript stack size"
+	default 16384
+
+config JERRYSCRIPT_HEAPSIZE
+	int "Jerryscript heap size"
+	default 107520
+
+endif
diff --git a/targets/nuttx-stm32f4/Make.defs b/targets/nuttx-stm32f4/Make.defs
@@ -0,0 +1,18 @@
+# Copyright 2016 Samsung Electronics Co., Ltd.
+# Copyright 2016 University of Szeged
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ifeq ($(CONFIG_JERRYSCRIPT),y)
+CONFIGURED_APPS += interpreters/jerryscript
+endif
diff --git a/targets/nuttx-stm32f4/Makefile b/targets/nuttx-stm32f4/Makefile
@@ -0,0 +1,46 @@
+# Copyright 2016 Samsung Electronics Co., Ltd.
+# Copyright 2016 University of Szeged
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+-include $(TOPDIR)/Make.defs
+
+# Jerryscript built-in application info
+
+CONFIG_JERRYSCRIPT_PRIORITY ?= SCHED_PRIORITY_DEFAULT
+CONFIG_JERRYSCRIPT_STACKSIZE ?= 16384
+CONFIG_JERRYSCRIPT_HEAPSIZE ?= 107520
+
+APPNAME = jerry
+# path to the project dir, "jerry-nuttx" by default
+ROOT_DIR = ../../..
+PRIORITY = $(CONFIG_JERRYSCRIPT_PRIORITY)
+STACKSIZE = $(CONFIG_JERRYSCRIPT_STACKSIZE)
+CFLAGS += -std=c99 -DJERRY_NDEBUG '-DCONFIG_MEM_HEAP_AREA_SIZE=$(CONFIG_JERRYSCRIPT_HEAPSIZE)'
+CFLAGS += -I$(ROOT_DIR)/ $(shell find $(ROOT_DIR)/jerryscript/jerry-core -type d | sed -r -e 's/^/-I/g')
+
+# Jerryscript
+
+.PHONY: jerry_core_allin.c
+jerry_core_allin.c:
+	echo '#include "jerryscript/jerry-libm/nextafter.c"' > jerry_core_allin.c
+	find $(ROOT_DIR)/jerryscript/jerry-core -name "*.c" | sed -r -e 's/(\.\.\/)*(.+)/#include "\2"/g' >> jerry_core_allin.c
+
+ASRCS =
+CSRCS = jerry_core_allin.c
+MAINSRC = jerry_main.c
+
+CONFIG_JERRYSCRIPT_PROGNAME ?= jerry$(EXEEXT)
+PROGNAME = $(CONFIG_JERRYSCRIPT_PROGNAME)
+
+include $(APPDIR)/Application.mk
diff --git a/targets/nuttx-stm32f4/Makefile.nuttx b/targets/nuttx-stm32f4/Makefile.nuttx
diff --git a/targets/nuttx-stm32f4/README.md b/targets/nuttx-stm32f4/README.md
@@ -1,143 +1,91 @@
 ### About
 
-This folder contains files to run JerryScript on NuttX with
-[STM32F4-Discovery with BB](http://www.st.com/web/en/catalog/tools/FM116/SC959/SS1532/LN1199/PF255417)
-
+This folder contains files to run JerryScript on
+[STM32F4-Discovery board](http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/stm32f4discovery.html) with [NuttX](http://nuttx.org/)
 
 ### How to build
 
-#### 1. Preface
+#### 1. Setting up the build environment for STM32F4-Discovery board
+
+Clone JerryScript and NuttX into jerry-nuttx directory
 
-1, Directory structure
+```
+mkdir jerry-nuttx
+cd jerry-nuttx
+git clone https://github.com/Samsung/jerryscript.git
+git clone https://bitbucket.org/nuttx/nuttx.git
+git clone https://bitbucket.org/nuttx/apps.git
+git clone https://github.com/texane/stlink.git
+```
 
-Assume `harmony` as the root folder to the projects to build.
-The folder tree related would look like this.
+The following directory structure is created after these commands
 
 ```
-harmony
+jerry-nuttx
+  + apps
   + jerryscript
   |  + targets
   |      + nuttx-stm32f4
   + nuttx
-  |  + nuttx
-  |      + lib
-  + st-link
-```
-
-
-2, Target board
-
-Assume [STM32F4-Discovery with BB](http://www.st.com/web/en/catalog/tools/FM116/SC959/SS1532/LN1199/PF255417)
-as the target board.
-
-
-3, Micro SD-Card memory for Script source files
-
-
-#### 2. Prepare NuttX
-
-Follow [this](https://bitbucket.org/seanshpark/nuttx/wiki/Home) page to get
-NuttX source and do the first build. When it stops with and error,
-change default project from `IoT.js` to `JerryScript` as follows;
-
-2-1) run menuconfig
+  + stlink
 ```
-# assume you are in nuttx folder where .config exist
-make menuconfig
-```
-2-2) Select `Application Configuration` --> `Interpreters`
-
-2-3) Check `[*] JerryScript interpreter` (Move cursor to the line and press `Space`)
 
-2-4) `< Exit >` once on the bottom of the sceen (Press `Right arrow` and `Enter`)
+#### 2. Adding JerryScript as an interpreter for NuttX
 
-2-5) Select `System Libraries and NSH Add-Ons`
-
-2-6) Un-Check `[ ] iotjs program` (Move cursor to the line and press `Space`)
-
-2-7) `< Exit >` till `menuconfig` ends. Save new configugation when asked.
-
-2-7) `make` again
 ```
-make
+cd apps/interpreters
+mkdir jerryscript
+cp ../../jerryscript/targets/nuttx-stm32f4/* ./jerryscript/
 ```
 
-It'll show the last error but it's ok. Nows the time to build JerryScript.
-
+#### 3. Configure NuttX
 
-#### 3. Build JerryScript for NuttX
-
-```
-# assume you are in harmony folder
-cd jerryscript
-make -f ./targets/nuttx-stm32f4/Makefile.nuttx
 ```
+# assuming you are in jerry-nuttx folder
+cd nuttx/tools
 
-If you have NuttX at another path than described above, you can give the
-absolute path with `NUTTX` variable , for example,
-```
-NUTTX=/home/user/work/nuttx make -f ./targets/nuttx-stm32f4/Makefile.nuttx
-```
+# configure NuttX USB console shell
+./configure.sh stm32f4discovery/usbnsh
 
-Make will copy three library files to `nuttx/nuttx/lib` folder
-```
-libjerryentry.a
-libjerrycore.a
-libjerrylibm.a
+cd ..
+# might require to run "make menuconfig" twice
+make menuconfig
 ```
 
-In NuttX, if you run `make clean`, above library files are also removed so you
-may have to build JerryScript again.
+Change "Build Setup" -> "Build Host Platform" from "Windows" to "Linux"
+Enable "System Type" -> "FPU support"
+Enable "Library Routines" -> "Standard Math library"
+Enable "Application Configuration" -> "Interpreters->JerryScript"
 
-#### 4. Continue build NuttX
+#### 4. Build JerryScript for NuttX
 
 ```
-# asssume you are in harmony folder
-cd nuttx/nuttx
+# assuming you are in jerry-nuttx folder
+cd nuttx/
 make
 ```
 
-
 #### 5. Flashing
 
 Connect Mini-USB for power supply and connect Micro-USB for `NSH` console.
 
-Please refer [this](https://github.com/Samsung/iotjs/wiki/Build-for-NuttX#prepare-flashing-to-target-board)
-link to prepare `stlink` utility.
-
-
-To flash with `Makefile.nuttx`,
-```
-# assume you are in jerryscript folder
-make -f ./targets/nuttx-stm32f4/Makefile.nuttx flash
-```
-
-#### 6. Cleaning
+To configure `stlink` utility for flashing, follow the instructions [here](https://github.com/texane/stlink#build-from-sources).
 
-To clean the build result,
+To flash,
 ```
-make -f ./targets/nuttx-stm32f4/Makefile.nuttx clean
+# assuming you are in nuttx folder
+sudo ../stlink/build/st-flash write nuttx.bin 0x8000000
 ```
 
-
 ### Running JerryScript
 
-Prepare a micro SD-card and prepare `hello.js` like this in the root directory of SD-card.
-
-```
-print("Hello JerryScript!");
-```
-
-Power Off(unplug both USB cables), plug the memory card to BB, and power on again.
-
-You can use `minicom` for terminal program, or any other you may like, but match
+You can use `minicom` for terminal program, or any other you may like, but set
 baud rate to `115200`.
 
 ```
-minicom --device=/dev/ttyACM0 --baud=115200
+sudo minicom --device=/dev/ttyACM0 --baud=115200
 ```
 
-
 You may have to press `RESET` on the board and press `Enter` keys on the console
 several times to make `nsh` prompt to appear.
 
@@ -152,27 +100,16 @@ please set `Add Carriage Ret` option by `CTRL-A` > `Z` > `U` at the console,
 if you're using `minicom`.
 
 
-Run `jerryscript` with `hello.js`
+Run `jerry` with javascript file(s)
 
 ```
 NuttShell (NSH)
-nsh>
-nsh>
-nsh> jerryscript /mnt/sdcard/hello.js
-PARAM 1 : [/mnt/sdcard/hello.js]
-Hello JerryScript!
-```
-
-Please give absolute path of the script file or may get an error like this.
-```
-nsh> cd /mnt/sdcard
-nsh> jerryscript ./hello.js
-PARAM 1 : [./hello.js]
-Failed to fopen [./hello.js]
-JERRY_STANDALONE_EXIT_CODE_FAIL
-nsh>
-nsh>
-nsh> jerryscript /mnt/sdcard/hello.js
-PARAM 1 : [/mnt/sdcard/hello.js]
-Hello JerryScript!
+nsh> jerry full_path/any.js
+```
+
+Without argument it prints:
+```
+nsh> jerry
+No input files, running a hello world demo:
+Hello world 5 times from JerryScript
 ```
diff --git a/targets/nuttx-stm32f4/jerry_main.c b/targets/nuttx-stm32f4/jerry_main.c
