diff --git a/.travis.yml b/.travis.yml index 48e6a0906..908c31ba6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,7 +156,7 @@ matrix: apt: sources: - sourceline: ppa:team-gcc-arm-embedded/ppa - packages: [gcc-arm-embedded] + packages: [gcc-arm-embedded, genromfs] install: make -f ./targets/tizenrt-artik053/Makefile.travis install script: make -f ./targets/tizenrt-artik053/Makefile.travis script diff --git a/targets/tizenrt-artik053/Makefile.travis b/targets/tizenrt-artik053/Makefile.travis index 7c03342ab..4c3b94205 100644 --- a/targets/tizenrt-artik053/Makefile.travis +++ b/targets/tizenrt-artik053/Makefile.travis @@ -23,7 +23,7 @@ all: # Fetch Tizen RT repository. install: - git clone https://github.com/Samsung/TizenRT.git ../TizenRT -b 1.1_Public_Release + git clone https://github.com/Samsung/TizenRT.git ../TizenRT -b 2.0_Public_M2 ## Targets for building Tizen RT with JerryScript. @@ -32,7 +32,6 @@ install: script-add-jerryscript: cp -R targets/tizenrt-artik053/apps/jerryscript/ ../TizenRT/apps/system/ cp -R targets/tizenrt-artik053/configs/jerryscript/ ../TizenRT/build/configs/artik053/ - cp -R targets/tizenrt-artik053/romfs-1.1.patch ../TizenRT/ # Build the JerryScript library. script-libjerry: @@ -41,6 +40,5 @@ script-libjerry: # Configure and build the firmware (Tizen RT with JerryScript). script: script-add-jerryscript script-libjerry cd ../TizenRT/os/tools && ./configure.sh artik053/jerryscript - cd ../TizenRT && patch -p1 :$PATH ``` -* Get the jerryscript and TizenRT sources +* Get jerryscript and TizenRT sources. ``` $ mkdir jerry-tizenrt $ cd jerry-tizenrt $ git clone https://github.com/pando-project/jerryscript.git -$ git clone https://github.com/Samsung/TizenRT.git -b 1.1_Public_Release +$ git clone https://github.com/Samsung/TizenRT.git -b 2.0_Public_M2 ``` -The following directory structure is created after these commands +The following directory structure is created after these commands: ``` jerry-tizenrt @@ -57,7 +57,6 @@ jerry-tizenrt ``` $ cp -r jerryscript/targets/tizenrt-artik053/apps/jerryscript/ TizenRT/apps/system/ $ cp -r jerryscript/targets/tizenrt-artik053/configs/jerryscript/ TizenRT/build/configs/artik053/ -$ cp jerryscript/targets/tizenrt-artik053/romfs-1.1.patch TizenRT/ ``` #### 3. Configure TizenRT @@ -67,19 +66,7 @@ $ cd TizenRT/os/tools $ ./configure.sh artik053/jerryscript ``` -#### 4. Configure TizenRT - -``` -$ cd ../../ -$ patch -p1 < romfs-1.1.patch -$ cd build/output/ -$ mkdir res -# You can add files in res folder -# The res folder is later flashing into the target's /rom folder -# CAUTION: You must not exceed 400kb -``` - -#### 5. Build JerryScript for TizenRT +#### 4. Build JerryScript for TizenRT ``` # assuming you are in jerry-tizenrt folder @@ -94,7 +81,7 @@ jerryscript/tools/build.py \ --toolchain=${PWD}/jerryscript/cmake/toolchain_mcu_artik053.cmake ``` -**Note**: there is a Makefile in the `targets/tizenrt-artik053/` folder that also helps to build JerryScript for TizenRT. +Alternatively, there is a Makefile in the `targets/tizenrt-artik053/` folder that also helps to build JerryScript for TizenRT. ``` # assuming you are in jerry-tizenrt folder @@ -102,6 +89,17 @@ $ cd jerryscript $ make -f targets/tizenrt-artik053/Makefile.tizenrt ``` +#### 5. Add your JavaScript program to TizenRT (optional) + +If you have script files for JerryScript, you can add them to TizenRT. +These files will be flashed into the target's `/rom` folder. +Note that your content cannot exceed 1200 KB. + +``` +# assuming you are in jerry-tizenrt folder +cp jerryscript/tests/hello.js TizenRT/tools/fs/contents/ +``` + #### 6. Build TizenRT binary ``` @@ -109,15 +107,10 @@ $ make -f targets/tizenrt-artik053/Makefile.tizenrt $ cd TizenRT/os $ make ``` -Binaries are available in TizenRT/build/output/bin -#### 7. Generate romfs +Binaries are available in `TizenRT/build/output/bin`. -``` -$ genromfs -f ../build/output/bin/rom.img -d ../build/output/res/ -V "NuttXBootVol" -``` - -#### 8. Flash binary +#### 7. Flash binary ``` make download ALL @@ -128,24 +121,24 @@ Reboot the device. For more information, see [How to program a binary](https://github.com/Samsung/TizenRT/blob/master/build/configs/artik053/README.md). -#### 9. Run JerryScript +#### 8. Run JerryScript -You can use `minicom` for terminal program, or any other you may like, but set -baud rate to `115200`. - -(Note: Device path may differ like /dev/ttyUSB1.) +Use a terminal program (e.g., `minicom`) with baud rate of `115200`. +(Note: Actual device path may vary, e.g., `/dev/ttyUSB1`.) ``` sudo minicom --device=/dev/ttyUSB0 --baud=115200 ``` -Run `jerry` with javascript file(s) +Run `jerry` with javascript file(s): + ``` -TASH>>jerry hello.js +TASH>>jerry /rom/hello.js Hello JerryScript! ``` -Without argument it prints: +Running the program without argument executes a built-in demo: + ``` TASH>>jerry No input files, running a hello world demo: diff --git a/targets/tizenrt-artik053/configs/jerryscript/Make.defs b/targets/tizenrt-artik053/configs/jerryscript/Make.defs index d1dd34836..0982fd073 100644 --- a/targets/tizenrt-artik053/configs/jerryscript/Make.defs +++ b/targets/tizenrt-artik053/configs/jerryscript/Make.defs @@ -69,16 +69,11 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk -include ${TOPDIR}/arch/arm/src/armv7-r/Toolchain.defs +ARCH_FAMILY = $(patsubst "%",%,$(CONFIG_ARCH_FAMILY)) +include ${TOPDIR}/arch/$(CONFIG_ARCH)/src/$(ARCH_FAMILY)/Toolchain.defs LDSCRIPT = flash.ld -ifeq ($(CONFIG_UCLIBCXX_HAVE_LIBSUPCXX),y) -LIBSUPXX = ${shell $(CC) --print-file-name=libsupc++.a} -EXTRA_LIBPATHS = -L "${shell dirname "$(LIBSUPXX)"}" -EXTRA_LIBS = -lsupc++ -endif - EXTRA_LIBS += -ljerry-core -ljerry-libm -ljerry-ext ifeq ($(WINTOOL),y) @@ -86,15 +81,15 @@ ifeq ($(WINTOOL),y) DIRLINK = $(TOPDIR)/tools/copydir.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mkwindeps.sh - ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" - ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" -isystem "${shell cygpath -w $(TOPDIR)/include/uClibc++}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/../framework/include}" -isystem "${shell cygpath -w $(TOPDIR)/../external/include}" + ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/../external/include}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/../build/configs/artik053/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) - ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/../framework/include - ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/uClibc++ - ARCHSCRIPT = -T$(TOPDIR)/../build/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/../framework/include -isystem $(TOPDIR)/../external/include + ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/../external/include + ARCHSCRIPT = -T$(TOPDIR)/../build/configs/artik053/scripts/$(LDSCRIPT) endif @@ -150,18 +145,11 @@ CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) AFLAGS = $(CFLAGS) -D__ASSEMBLY__ -NXFLATLDFLAGS1 = -r -d -warn-common -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections -LDNXFLATFLAGS = -e main -s 2048 - ASMEXT = .S OBJEXT = .o LIBEXT = .a EXEEXT = -ifneq ($(CROSSDEV),arm-nuttx-elf-) - LDFLAGS += -nostartfiles -nodefaultlibs -endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif @@ -174,6 +162,13 @@ HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe HOSTLDFLAGS = define DOWNLOAD - @$(TOPDIR)/../build/configs/artik053/artik053_download.sh $(1) + $(TOPDIR)/../build/configs/artik05x/artik05x_download.sh --board=artik053 $(1) $(2) $(3) $(4) $(5) $(6) endef +define OTA_IMG + $(TOPDIR)/../build/configs/artik05x/artik05x_ota.sh +endef + +define MAKE_BOARD_SPECIFIC_BIN + $(TOPDIR)/../build/configs/artik05x/artik05x_make_bin.sh --bin $(1) --ext $(2) +endef diff --git a/targets/tizenrt-artik053/configs/jerryscript/defconfig b/targets/tizenrt-artik053/configs/jerryscript/defconfig index a24bdfd4d..72a8ccc27 100644 --- a/targets/tizenrt-artik053/configs/jerryscript/defconfig +++ b/targets/tizenrt-artik053/configs/jerryscript/defconfig @@ -30,7 +30,6 @@ CONFIG_BUILD_FLAT=y # CONFIG_INTELHEX_BINARY is not set # CONFIG_MOTOROLA_SREC is not set CONFIG_RAW_BINARY=y -CONFIG_SAMSUNG_NS2=y # CONFIG_UBOOT_UIMAGE is not set # CONFIG_DOWNLOAD_IMAGE is not set # CONFIG_SMARTFS_IMAGE is not set @@ -43,72 +42,32 @@ CONFIG_SAMSUNG_NS2=y # CONFIG_ARCH_MATH_H is not set # CONFIG_ARCH_FLOAT_H is not set # CONFIG_ARCH_STDARG_H is not set - -# -# Debug Options -# -CONFIG_DEBUG=y -CONFIG_DEBUG_ERROR=y -# CONFIG_DEBUG_WARN is not set -CONFIG_DEBUG_VERBOSE=y - -# -# Subsystem Debug Options -# -# CONFIG_DEBUG_FS is not set -# CONFIG_DEBUG_LIB is not set -# CONFIG_DEBUG_MM is not set -# CONFIG_DEBUG_SCHED is not set - -# -# OS Function Debug Options -# -# CONFIG_ARCH_HAVE_HEAPCHECK is not set -CONFIG_DEBUG_MM_HEAPINFO=y -# CONFIG_DEBUG_IRQ is not set -# CONFIG_DEBUG_IRQ_INFO is not set - -# -# Driver Debug Options -# -# CONFIG_DEBUG_PWM is not set -# CONFIG_DEBUG_RTC is not set -# CONFIG_DEBUG_SPI is not set -# CONFIG_DEBUG_WATCHDOG is not set -# CONFIG_DEBUG_TTRACE is not set - -# -# Stack Debug Options -# -CONFIG_ARCH_HAVE_STACKCHECK=y -CONFIG_STACK_COLORATION=y - -# -# Build Debug Options -# -CONFIG_DEBUG_SYMBOLS=y -# CONFIG_FRAME_POINTER is not set CONFIG_ARCH_HAVE_CUSTOMOPT=y # CONFIG_DEBUG_NOOPT is not set # CONFIG_DEBUG_CUSTOMOPT is not set CONFIG_DEBUG_FULLOPT=y +# +# Hardware Configuration +# + # # Chip Selection # CONFIG_ARCH_ARM=y CONFIG_ARCH="arm" +# CONFIG_ARCH_CHIP_LM is not set +CONFIG_ARCH_CHIP_S5J=y +# CONFIG_ARCH_CHIP_BCM4390X is not set +CONFIG_ARCH_CHIP="s5j" # # ARM Options # -# CONFIG_ARCH_CHIP_LM is not set -CONFIG_ARCH_CHIP_S5J=y # CONFIG_ARCH_CORTEXM3 is not set # CONFIG_ARCH_CORTEXM4 is not set CONFIG_ARCH_CORTEXR4=y CONFIG_ARCH_FAMILY="armv7-r" -CONFIG_ARCH_CHIP="s5j" # CONFIG_ARCH_HAVE_FPU is not set CONFIG_ARMV7M_MPU=y CONFIG_ARMV7M_MPU_NREGIONS=12 @@ -134,7 +93,6 @@ CONFIG_ARMV7R_DCACHE=y CONFIG_ARMV7R_TOOLCHAIN_GNU_EABIL=y # CONFIG_ARMV7R_TOOLCHAIN_GNU_OABI is not set # CONFIG_ARMV7R_HAVE_DECODEFIQ is not set -# CONFIG_BOOT_RESULT is not set # # S5J Configuration Options @@ -146,7 +104,9 @@ CONFIG_S5J_S5JT200=y # S5J Peripheral Support # CONFIG_S5J_HAVE_ADC=y +CONFIG_S5J_HAVE_DMA=y CONFIG_S5J_HAVE_I2C=y +CONFIG_S5J_HAVE_I2S=y CONFIG_S5J_HAVE_MCT=y CONFIG_S5J_HAVE_PWM0=y CONFIG_S5J_HAVE_PWM1=y @@ -154,7 +114,6 @@ CONFIG_S5J_HAVE_PWM2=y CONFIG_S5J_HAVE_PWM3=y CONFIG_S5J_HAVE_PWM4=y CONFIG_S5J_HAVE_PWM5=y -CONFIG_S5J_HAVE_PWR=y CONFIG_S5J_HAVE_RTC=y CONFIG_S5J_HAVE_SFLASH=y CONFIG_S5J_HAVE_SPI=y @@ -166,9 +125,11 @@ CONFIG_S5J_HAVE_UART3=y CONFIG_S5J_HAVE_UART4=y CONFIG_S5J_HAVE_WATCHDOG=y # CONFIG_S5J_ADC is not set -CONFIG_S5J_I2C=y -# CONFIG_S5J_MCT is not set -# CONFIG_S5J_TIMER0 is not set +# CONFIG_S5J_DMA is not set +# CONFIG_S5J_I2C is not set +# CONFIG_S5J_I2S is not set +CONFIG_S5J_MCT=y +CONFIG_S5J_TIMER0=y # CONFIG_S5J_TIMER1 is not set # CONFIG_S5J_TIMER2 is not set # CONFIG_S5J_TIMER3 is not set @@ -176,7 +137,6 @@ CONFIG_S5J_I2C=y CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y -# CONFIG_S5J_UART2_FLOWCONTROL is not set CONFIG_S5J_UART3=y # CONFIG_S5J_UART3_FLOWCONTROL is not set CONFIG_S5J_UART4=y @@ -191,13 +151,7 @@ CONFIG_S5J_UART4=y CONFIG_S5J_SPI=y # CONFIG_S5J_WATCHDOG is not set CONFIG_S5J_SFLASH=y -CONFIG_S5J_PWR=y - -# -# PMU Configuration -# -# CONFIG_S5J_PWR_DSTOP is not set -# CONFIG_S5J_PWR_SLEEP is not set +# CONFIG_S5J_SENSOR_PPD42NS is not set # # Architecture Options @@ -218,7 +172,8 @@ CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARCH_HAVE_POWEROFF is not set CONFIG_ARCH_HAVE_RESET=y CONFIG_ARCH_USE_MPU=y -# CONFIG_ARCH_STACKDUMP is not set +CONFIG_ARCH_STACKDUMP=y +# CONFIG_DEBUG_DISPLAY_SYMBOL is not set # CONFIG_ENDIAN_BIG is not set # CONFIG_ARCH_IDLE_CUSTOM is not set # CONFIG_ARCH_HAVE_RAMFUNCS is not set @@ -250,47 +205,53 @@ CONFIG_BOOT_RUNFROMFLASH=y # Boot Memory Configuration # CONFIG_RAM_START=0x02023800 -CONFIG_RAM_SIZE=804864 +CONFIG_RAM_SIZE=968704 +# CONFIG_DDR is not set # CONFIG_ARCH_HAVE_SDRAM is not set # # Board Selection # CONFIG_ARCH_BOARD_ARTIK053=y +# CONFIG_ARCH_BOARD_ARTIK053S is not set +# CONFIG_ARCH_BOARD_ARTIK055S is not set # CONFIG_ARCH_BOARD_SIDK_S5JT200 is not set -CONFIG_ARCH_BOARD="artik053" +CONFIG_ARCH_BOARD_ARTIK05X_FAMILY=y +CONFIG_ARCH_BOARD="artik05x" # # Common Board Options # # CONFIG_BOARD_CRASHDUMP is not set +# CONFIG_BOARD_ASSERT_AUTORESET is not set CONFIG_LIB_BOARDCTL=y CONFIG_BOARDCTL_RESET=y # CONFIG_BOARDCTL_UNIQUEID is not set -# CONFIG_BOARD_COREDUMP_FLASH is not set # CONFIG_BOARD_FOTA_SUPPORT is not set -# CONFIG_BOARD_RAMDUMP_FLASH is not set -# CONFIG_BOARD_RAMDUMP_UART is not set # # Board-Specific Options # -CONFIG_ARTIK053_BOOT_FAILURE_DETECTION=y -CONFIG_ARTIK053_BOOT_COUNTS_ADDR=0x80090810 -CONFIG_ARTIK053_FLASH_CAPACITY=8388608 -CONFIG_ARTIK053_FLASH_PAGE_SIZE=4096 -CONFIG_ARTIK053_FLASH_PART=y -CONFIG_ARTIK053_FLASH_MINOR=0 -CONFIG_ARTIK053_FLASH_PART_LIST="16,48,192,32,512,2400,1536,1536,1000,400,8,512," -CONFIG_ARTIK053_FLASH_PART_TYPE="none,ftl,none,none,none,none,none,ftl,smartfs,romfs,config,none," -CONFIG_ARTIK053_FLASH_PART_NAME="bl1,sssro,bl2,sssfw,wlanfw,os,factory,ota,user,rom,nvram,sssrw," -CONFIG_ARTIK053_AUTOMOUNT=y -CONFIG_ARTIK053_AUTOMOUNT_USERFS=y -CONFIG_ARTIK053_AUTOMOUNT_USERFS_DEVNAME="/dev/smart0p8" -CONFIG_ARTIK053_AUTOMOUNT_USERFS_MOUNTPOINT="/mnt" +CONFIG_ARTIK05X_BOOT_FAILURE_DETECTION=y +CONFIG_ARTIK05X_BOOT_COUNTS_ADDR=0x80090810 +CONFIG_ARTIK05X_FLASH_CAPACITY=8388608 +CONFIG_ARTIK05X_FLASH_PAGE_SIZE=4096 +CONFIG_ARTIK05X_FLASH_PART=y +CONFIG_ARTIK05X_FLASH_MINOR=0 +CONFIG_ARTIK05X_FLASH_PART_LIST="16,48,192,32,512,2400,1536,1536,200,1200,8,512," +CONFIG_ARTIK05X_FLASH_PART_TYPE="none,ftl,none,none,none,none,none,ftl,smartfs,romfs,config,none," +CONFIG_ARTIK05X_FLASH_PART_NAME="bl1,sssro,bl2,sssfw,wlanfw,os,factory,ota,user,rom,nvram,sssrw," +CONFIG_ARTIK05X_AUTOMOUNT=y +CONFIG_ARTIK05X_AUTOMOUNT_USERFS=y +CONFIG_ARTIK05X_AUTOMOUNT_USERFS_DEVNAME="/dev/smart0p8" +CONFIG_ARTIK05X_AUTOMOUNT_USERFS_MOUNTPOINT="/mnt" +# CONFIG_ARTIK05X_AUTOMOUNT_SSSRW is not set +CONFIG_ARTIK05X_AUTOMOUNT_ROMFS=y +CONFIG_ARTIK05X_AUTOMOUNT_ROMFS_DEVNAME="/dev/mtdblock9" +CONFIG_ARTIK05X_AUTOMOUNT_ROMFS_MOUNTPOINT="/rom" # -# RTOS Features +# Kernel Features # CONFIG_DISABLE_OS_API=y # CONFIG_DISABLE_POSIX_TIMERS is not set @@ -319,7 +280,7 @@ CONFIG_PREALLOC_TIMERS=8 CONFIG_INIT_ENTRYPOINT=y CONFIG_RR_INTERVAL=100 CONFIG_TASK_NAME_SIZE=31 -CONFIG_MAX_TASKS=16 +CONFIG_MAX_TASKS=32 CONFIG_SCHED_HAVE_PARENT=y # CONFIG_SCHED_CHILD_STATUS is not set CONFIG_SCHED_WAITPID=y @@ -332,6 +293,7 @@ CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_MUTEX_UNSAFE=y # CONFIG_PTHREAD_MUTEX_BOTH is not set CONFIG_NPTHREAD_KEYS=4 +CONFIG_NPTHREAD_DESTRUCTOR_ITERATIONS=4 # CONFIG_PTHREAD_CLEANUP is not set # CONFIG_CANCELLATION_POINTS is not set @@ -339,7 +301,6 @@ CONFIG_NPTHREAD_KEYS=4 # Performance Monitoring # # CONFIG_SCHED_CPULOAD is not set -# CONFIG_SCHED_INSTRUMENTATION is not set # # Latency optimization @@ -353,7 +314,7 @@ CONFIG_DEV_CONSOLE=y # CONFIG_FDCLONE_DISABLE is not set # CONFIG_FDCLONE_STDIO is not set # CONFIG_SDCLONE_DISABLE is not set -CONFIG_NFILE_DESCRIPTORS=64 +CONFIG_NFILE_DESCRIPTORS=16 CONFIG_NFILE_STREAMS=16 CONFIG_NAME_MAX=32 # CONFIG_PRIORITY_INHERITANCE is not set @@ -366,7 +327,6 @@ CONFIG_BOARD_INITIALIZE=y # CONFIG_SCHED_STARTHOOK is not set CONFIG_SCHED_ATEXIT=y CONFIG_SCHED_ONEXIT=y -CONFIG_SCHED_ONEXIT_MAX=1 # # Signal Numbers @@ -393,7 +353,11 @@ CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=224 CONFIG_SCHED_HPWORKPERIOD=50000 CONFIG_SCHED_HPWORKSTACKSIZE=2048 -# CONFIG_SCHED_LPWORK is not set +CONFIG_SCHED_LPWORK=y +CONFIG_SCHED_LPNTHREADS=1 +CONFIG_SCHED_LPWORKPRIORITY=176 +CONFIG_SCHED_LPWORKPERIOD=50000 +CONFIG_SCHED_LPWORKSTACKSIZE=2048 # # Stack size information @@ -404,42 +368,25 @@ CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 -# -# System Call -# -# CONFIG_LIB_SYSCALL is not set - # # Device Drivers # # CONFIG_DISABLE_POLL is not set CONFIG_DEV_NULL=y -# CONFIG_DEV_ZERO is not set - -# -# Buffering -# +CONFIG_DEV_ZERO=y # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_CAN is not set # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set -CONFIG_PWM=y +# CONFIG_PWM is not set # CONFIG_ARCH_HAVE_I2CRESET is not set -CONFIG_I2C=y -CONFIG_I2C_SLAVE=y -CONFIG_I2C_USERIO=y -CONFIG_I2C_TRANSFER=y -CONFIG_I2C_POLLED=y -# CONFIG_I2C_TRACE is not set -# CONFIG_I2C_WRITEREAD is not set -CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set -# CONFIG_SPI_EXCHANGE is not set -# CONFIG_SPI_CMDDATA is not set -# CONFIG_SPI_BITBANG is not set -CONFIG_GPIO=y -# CONFIG_BCH is not set +# CONFIG_I2C is not set +# CONFIG_SPI is not set +# CONFIG_GPIO is not set +# CONFIG_I2S is not set +# CONFIG_AUDIO_DEVICES is not set +CONFIG_BCH=y CONFIG_RTC=y CONFIG_RTC_DATETIME=y # CONFIG_RTC_ALARM is not set @@ -448,16 +395,11 @@ CONFIG_RTC_DRIVER=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0" # CONFIG_TIMER is not set -CONFIG_ANALOG=y -CONFIG_ADC=y -CONFIG_ADC_FIFOSIZE=8 -# CONFIG_DAC is not set -# CONFIG_LCD is not set +# CONFIG_ANALOG is not set # CONFIG_PIPES is not set CONFIG_POWER=y # CONFIG_BATTERY_CHARGER is not set # CONFIG_BATTERY_GAUGE is not set -# CONFIG_SERCOMM_CONSOLE is not set CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set @@ -492,7 +434,6 @@ CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set -# CONFIG_SERIAL_TIOCSERGSTRUCT is not set CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_SERIAL_TERMIOS=y # CONFIG_UART0_SERIAL_CONSOLE is not set @@ -518,8 +459,8 @@ CONFIG_UART0_2STOP=0 # # UART1 Configuration # -CONFIG_UART1_RXBUFSIZE=64 -CONFIG_UART1_TXBUFSIZE=64 +CONFIG_UART1_RXBUFSIZE=256 +CONFIG_UART1_TXBUFSIZE=256 CONFIG_UART1_BAUD=115200 CONFIG_UART1_BITS=8 CONFIG_UART1_PARITY=0 @@ -530,8 +471,8 @@ CONFIG_UART1_2STOP=0 # # UART2 Configuration # -CONFIG_UART2_RXBUFSIZE=64 -CONFIG_UART2_TXBUFSIZE=64 +CONFIG_UART2_RXBUFSIZE=256 +CONFIG_UART2_TXBUFSIZE=256 CONFIG_UART2_BAUD=115200 CONFIG_UART2_BITS=8 CONFIG_UART2_PARITY=0 @@ -562,6 +503,7 @@ CONFIG_UART4_PARITY=0 CONFIG_UART4_2STOP=0 # CONFIG_UART4_IFLOWCONTROL is not set # CONFIG_UART4_OFLOWCONTROL is not set +# CONFIG_SENSOR is not set # CONFIG_USBDEV is not set # CONFIG_FOTA_DRIVER is not set @@ -580,7 +522,6 @@ CONFIG_UART4_2STOP=0 # Wireless Device Options # # CONFIG_DRIVERS_WIRELESS is not set -# CONFIG_I2S is not set # # Networking Support @@ -590,16 +531,22 @@ CONFIG_UART4_2STOP=0 # CONFIG_NET is not set # -# File Systems +# Audio Support +# +# CONFIG_AUDIO is not set + +# +# Media Support # # -# File system configuration +# File Systems # # CONFIG_DISABLE_MOUNTPOINT is not set # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set CONFIG_FS_READABLE=y CONFIG_FS_WRITABLE=y +# CONFIG_FS_AIO is not set # CONFIG_FS_NAMED_SEMAPHORES is not set CONFIG_FS_MQUEUE_MPATH="/var/mqueue" CONFIG_FS_SMARTFS=y @@ -616,6 +563,7 @@ CONFIG_SMARTFS_ALIGNED_ACCESS=y # CONFIG_SMARTFS_JOURNALING is not set # CONFIG_SMARTFS_SECTOR_RECOVERY is not set CONFIG_FS_PROCFS=y +# CONFIG_FS_AUTOMOUNT_PROCFS is not set # # Exclude individual procfs entries @@ -627,6 +575,7 @@ CONFIG_FS_PROCFS=y # CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS is not set # CONFIG_FS_PROCFS_EXCLUDE_SMARTFS is not set CONFIG_FS_ROMFS=y +# CONFIG_FS_TMPFS is not set # # Block Driver Configurations @@ -664,11 +613,12 @@ CONFIG_MTD_SMART=y # # SMART Device options # -CONFIG_MTD_SMART_SECTOR_SIZE=4096 +CONFIG_MTD_SMART_SECTOR_SIZE=512 # CONFIG_MTD_SMART_WEAR_LEVEL is not set # CONFIG_MTD_SMART_ENABLE_CRC is not set # CONFIG_MTD_SMART_SECTOR_ERASE_DEBUG is not set # CONFIG_MTD_SMART_ALLOC_DEBUG is not set +# CONFIG_MTD_W25 is not set # # System Logging @@ -677,21 +627,16 @@ CONFIG_MTD_SMART_SECTOR_SIZE=4096 # CONFIG_SYSLOG_TIMESTAMP is not set # -# Arastorage -# - -# -# AraStorage database configuration +# Database # # CONFIG_ARASTORAGE is not set # # Memory Management # -# CONFIG_DISABLE_REALLOC_NEIGHBOR_EXTENTION is not set +# CONFIG_REALLOC_DISABLE_NEIGHBOR_EXTENSION is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 -# CONFIG_ARCH_HAVE_HEAP2 is not set # CONFIG_GRAN is not set # @@ -699,13 +644,30 @@ CONFIG_MM_REGIONS=1 # # CONFIG_PM is not set +# +# Debug Options +# +# CONFIG_DEBUG is not set + +# +# Stack Debug Options +# +CONFIG_ARCH_HAVE_STACKCHECK=y +CONFIG_STACK_COLORATION=y + +# +# Build Debug Options +# +# CONFIG_DEBUG_SYMBOLS is not set +# CONFIG_FRAME_POINTER is not set + # # Logger Module # # CONFIG_LOGM is not set # -# Library Routines +# Built-in Libraries # # @@ -718,14 +680,17 @@ CONFIG_LIB_HOMEDIR="/" CONFIG_LIBM=y # CONFIG_NOPRINTF_FIELDWIDTH is not set CONFIG_LIBC_FLOATINGPOINT=y -# CONFIG_LIBC_IOCTL_VARIADIC is not set +CONFIG_LIBC_FLOATPRECISION=6 +CONFIG_LIBC_SCANSET=y +# CONFIG_NOPRINTF_LONGLONG_TO_ASCII is not set +CONFIG_LIBC_IOCTL_VARIADIC=y +# CONFIG_LIBC_WCHAR is not set +# CONFIG_LIBC_LOCALE is not set CONFIG_LIB_RAND_ORDER=1 # CONFIG_EOL_IS_CR is not set # CONFIG_EOL_IS_LF is not set # CONFIG_EOL_IS_BOTH_CRLF is not set CONFIG_EOL_IS_EITHER_CRLF=y -CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024 -CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_LIBC_STRERROR=y # CONFIG_LIBC_STRERROR_SHORT is not set # CONFIG_LIBC_PERROR_STDOUT is not set @@ -735,14 +700,27 @@ CONFIG_ARCH_LOWPUTC=y # CONFIG_LIBC_LOCALTIME is not set # CONFIG_TIME_EXTENDED is not set CONFIG_LIB_SENDFILE_BUFSIZE=512 -# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set -# CONFIG_LIBC_NETDB is not set -# CONFIG_NETDB_HOSTFILE is not set +CONFIG_ARCH_OPTIMIZED_FUNCTIONS=y +# CONFIG_ARCH_MEMCPY is not set +CONFIG_MEMCPY_VIK=y +# CONFIG_MEMCPY_PRE_INC_PTRS is not set +CONFIG_MEMCPY_INDEXED_COPY=y +# CONFIG_MEMCPY_64BIT is not set +# CONFIG_ARCH_MEMCMP is not set +# CONFIG_ARCH_MEMMOVE is not set +# CONFIG_ARCH_MEMSET is not set +# CONFIG_MEMSET_OPTSPEED is not set +# CONFIG_ARCH_STRCHR is not set +# CONFIG_ARCH_STRCMP is not set +# CONFIG_ARCH_STRCPY is not set +# CONFIG_ARCH_STRNCPY is not set +# CONFIG_ARCH_STRLEN is not set +# CONFIG_ARCH_STRNLEN is not set +# CONFIG_ARCH_BZERO is not set # # Non-standard Library Support # -# CONFIG_AUDIO is not set # # Basic CXX Support @@ -751,73 +729,60 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # CONFIG_HAVE_CXX is not set # -# External Functions +# External Libraries # -# CONFIG_LWM2M_WAKAAMA is not set +# CONFIG_AVS_DEVICE_SDK is not set +# CONFIG_AWS_SDK is not set +# CONFIG_NETUTILS_CODECS is not set # -# IOTIVITY Config Parameters +# CURL Options # +# CONFIG_ENABLE_CURL is not set +# CONFIG_ERROR_REPORT is not set # CONFIG_ENABLE_IOTIVITY is not set +# CONFIG_NETUTILS_JSON is not set # CONFIG_LIBTUV is not set -# CONFIG_AWS_SDK is not set +# CONFIG_STRESS_TOOL is not set +# CONFIG_VOICE_SOFTWARE_EPD is not set # # Application Configuration # -CONFIG_ENTRY_MANUAL=y # # Application entry point list # -# CONFIG_ENTRY_HELLO is not set -# CONFIG_ENTRY_IOTJS is not set +CONFIG_ENTRY_MANUAL=y CONFIG_USER_ENTRYPOINT="jerry_main" CONFIG_BUILTIN_APPS=y # # Examples # -# CONFIG_EXAMPLES_ARTIK_DEMO is not set +# CONFIG_EXAMPLES_AVS_TEST is not set # CONFIG_EXAMPLES_AWS is not set +# CONFIG_EXAMPLES_CURLTEST is not set # CONFIG_EXAMPLES_EEPROM_TEST is not set +# CONFIG_EXAMPLES_EVENTLOOP is not set # CONFIG_EXAMPLES_FOTA_SAMPLE is not set +# CONFIG_FILESYSTEM_HELPER_ENABLE is not set # CONFIG_EXAMPLES_HELLO is not set -# CONFIG_EXAMPLES_HELLO_TASH is not set # CONFIG_EXAMPLES_HELLOXX is not set # CONFIG_EXAMPLES_IOTBUS_TEST is not set +# CONFIG_EXAMPLES_IOTJS_STARTUP is not set # CONFIG_EXAMPLES_KERNEL_SAMPLE is not set # CONFIG_EXAMPLES_LIBTUV is not set -# CONFIG_EXAMPLES_MTDPART is not set # CONFIG_EXAMPLES_NETTEST is not set # CONFIG_EXAMPLES_PROC_TEST is not set # CONFIG_EXAMPLES_SELECT_TEST is not set # CONFIG_EXAMPLES_SENSORBOARD is not set +# CONFIG_EXAMPLES_SETJMP_TEST is not set # CONFIG_EXAMPLES_SMART is not set # CONFIG_EXAMPLES_SMART_TEST is not set -# CONFIG_EXAMPLES_SYSIO_TEST is not set +# CONFIG_EXAMPLES_SPEECH_DETECTOR_TEST is not set +# CONFIG_EXAMPLES_ST_THINGS is not set # CONFIG_EXAMPLES_TESTCASE is not set -# CONFIG_EXAMPLES_WIFI_TEST is not set -# CONFIG_EXAMPLES_WORKQUEUE is not set - -# -# Network Utilities -# -# CONFIG_NETUTILS_CODECS is not set -# CONFIG_NETUTILS_DHCPC is not set -# CONFIG_NETUTILS_FTPC is not set -# CONFIG_NETUTILS_FTPD is not set -# CONFIG_NETUTILS_JSON is not set -# CONFIG_NETUTILS_LIBCOAP is not set -# CONFIG_NETUTILS_MDNS is not set -# CONFIG_NETUTILS_MQTT is not set -# CONFIG_NETUTILS_NETLIB is not set -# CONFIG_NETUTILS_NTPCLIENT is not set -# CONFIG_NETUTILS_SMTP is not set -# CONFIG_NETUTILS_TELNETD is not set -# CONFIG_NETUTILS_TFTPC is not set -# CONFIG_NETUTILS_WIFI is not set -# CONFIG_NETUTILS_XMLRPC is not set # # Platform-specific Support @@ -829,10 +794,11 @@ CONFIG_BUILTIN_APPS=y # CONFIG_TASH=y CONFIG_TASH_MAX_COMMANDS=32 -# CONFIG_DEBUG_TASH is not set -# CONFIG_TASH_COMMAND_INTERFACE is not set +# CONFIG_TASH_USLEEP is not set +CONFIG_TASH_COMMAND_INTERFACE=y CONFIG_TASH_CMDTASK_STACKSIZE=4096 CONFIG_TASH_CMDTASK_PRIORITY=100 +# CONFIG_TASH_SCRIPT is not set # # System Libraries and Add-Ons @@ -840,8 +806,8 @@ CONFIG_TASH_CMDTASK_PRIORITY=100 CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_CLE_DEBUGLEVEL=0 # CONFIG_SYSTEM_CUTERM is not set +# CONFIG_SYSTEM_FLASH_ERASEALL is not set # CONFIG_SYSTEM_FOTA_HAL is not set -# CONFIG_SYSTEM_I2CTOOL is not set # CONFIG_SYSTEM_INIFILE is not set CONFIG_SYSTEM_PREAPP_INIT=y CONFIG_SYSTEM_PREAPP_STACKSIZE=2048 @@ -849,39 +815,60 @@ CONFIG_SYSTEM_PREAPP_STACKSIZE=2048 CONFIG_JERRYSCRIPT=y CONFIG_JERRYSCRIPT_PRIORITY=100 CONFIG_JERRYSCRIPT_STACKSIZE=16384 -CONFIG_JERRYSCRIPT_HEAPSIZE=107520 -# CONFIG_JERRYSCRIPT_ERROR_MESSAGES is not set -# CONFIG_JERRYSCRIPT_MEM_STATS is not set -# CONFIG_JERRYSCRIPT_SHOW_OPCODES is not set -# CONFIG_JERRYSCRIPT_DEBUGGER is not set -# CONFIG_SYSTEM_POWEROFF is not set CONFIG_SYSTEM_RAMTEST=y +CONFIG_SYSTEM_RAMTEST_PRIORITY=100 +CONFIG_SYSTEM_RAMTEST_STACKSIZE=1024 CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y CONFIG_SYSTEM_INFORMATION=y CONFIG_KERNEL_CMDS=y CONFIG_FS_CMDS=y -CONFIG_FSCMD_BUFFER_LEN=32 -CONFIG_ENABLE_DATE=y -CONFIG_ENABLE_ENV_GET=y -CONFIG_ENABLE_ENV_SET=y -CONFIG_ENABLE_ENV_UNSET=y -CONFIG_ENABLE_FREE=y -CONFIG_ENABLE_HEAPINFO=y -# CONFIG_ENABLE_IRQINFO is not set -CONFIG_ENABLE_KILL=y -CONFIG_ENABLE_KILLALL=y -CONFIG_ENABLE_PS=y -CONFIG_ENABLE_STACKMONITOR=y +CONFIG_FSCMD_BUFFER_LEN=64 +CONFIG_ENABLE_DATE_CMD=y +CONFIG_ENABLE_ENV_GET_CMD=y +CONFIG_ENABLE_ENV_SET_CMD=y +CONFIG_ENABLE_ENV_UNSET_CMD=y +CONFIG_ENABLE_FREE_CMD=y +CONFIG_ENABLE_HEAPINFO_CMD=y +# CONFIG_HEAPINFO_USER_GROUP is not set +# CONFIG_ENABLE_IRQINFO_CMD is not set +CONFIG_ENABLE_KILL_CMD=y +CONFIG_ENABLE_KILLALL_CMD=y +CONFIG_ENABLE_PS_CMD=y +CONFIG_ENABLE_STACKMONITOR_CMD=y CONFIG_STACKMONITOR_PRIORITY=100 CONFIG_STACKMONITOR_INTERVAL=5 -CONFIG_ENABLE_UPTIME=y +CONFIG_ENABLE_UPTIME_CMD=y CONFIG_SYSTEM_VI=y CONFIG_SYSTEM_VI_COLS=64 CONFIG_SYSTEM_VI_ROWS=16 CONFIG_SYSTEM_VI_DEBUGLEVEL=0 # -# wpa_supplicant +# Runtime Environment # -# CONFIG_WPA_SUPPLICANT is not set \ No newline at end of file +# CONFIG_ENABLE_IOTJS is not set + +# +# Device Management +# + +# +# Task manager +# +# CONFIG_TASK_MANAGER is not set + +# +# Event Loop Framework +# +# CONFIG_EVENTLOOP is not set + +# +# Things Management +# +# CONFIG_ST_THINGS is not set + +# +# IoTBus Framework +# +# CONFIG_IOTBUS is not set diff --git a/targets/tizenrt-artik053/romfs-1.1.patch b/targets/tizenrt-artik053/romfs-1.1.patch deleted file mode 100644 index 9fb8e3ea9..000000000 --- a/targets/tizenrt-artik053/romfs-1.1.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/apps/system/init/init.c b/apps/system/init/init.c -index 3aaa1860..815a9c11 100644 ---- a/apps/system/init/init.c -+++ b/apps/system/init/init.c -@@ -139,6 +139,10 @@ int preapp_start(int argc, char *argv[]) - } - #endif - -+#ifdef CONFIG_FS_ROMFS -+ mount("/dev/smart4rom9", "/rom", "romfs", 0, NULL); -+#endif -+ - #if defined(CONFIG_LIB_USRWORK) || defined(CONFIG_TASH) - error_out: - return pid; -diff --git a/build/configs/artik053/artik053_download.sh b/build/configs/artik053/artik053_download.sh -index 0fa4b9a3..a3178545 100755 ---- a/build/configs/artik053/artik053_download.sh -+++ b/build/configs/artik053/artik053_download.sh -@@ -111,6 +111,7 @@ main() - flash_write sssfw ../../bin/sssfw.bin; \ - flash_write wlanfw ../../bin/wlanfw.bin; \ - flash_write os ../../../../output/bin/tinyara_head.bin; \ -+ flash_write rom ../../../../output/bin/rom.img; \ - exit' || finish_download 1 - popd - -diff --git a/build/configs/artik053/tools/openocd/partition_map.cfg b/build/configs/artik053/tools/openocd/partition_map.cfg -index c3abdeff..8dca6666 100644 ---- a/build/configs/artik053/tools/openocd/partition_map.cfg -+++ b/build/configs/artik053/tools/openocd/partition_map.cfg -@@ -18,7 +18,8 @@ set partition_list { - os { "OS" 0x040C8000 0x00258000 0 } - factory { "Factory Reset" 0x04320000 0x00180000 0 } - ota { "OTA download" 0x044A0000 0x00180000 0 } -- user { "USER R/W" 0x04620000 0x0015E000 0 } -+ user { "USER R/W" 0x04620000 0x000FA000 0 } -+ rom { "ROM FS" 0x0471A000 0x00064000 0 } - nvram { "WiFi NVRAM" 0x0477E000 0x00002000 1 } - sssrw { "SSS R/W Key" 0x04780000 0x00080000 1 } - } diff --git a/targets/tizenrt-artik053/romfs.patch b/targets/tizenrt-artik053/romfs.patch deleted file mode 100644 index 90a2aab5c..000000000 --- a/targets/tizenrt-artik053/romfs.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git apps/system/init/init.c apps/system/init/init.c -index 5d5e360..430e2f5 100644 ---- apps/system/init/init.c -+++ apps/system/init/init.c -@@ -130,6 +130,10 @@ int preapp_start(int argc, char *argv[]) - } - #endif - -+#ifdef CONFIG_FS_ROMFS -+ mount("/dev/smart4rom9", "/rom", "romfs", 0, NULL); -+#endif -+ - #if defined(CONFIG_LIB_USRWORK) || defined(CONFIG_TASH) - error_out: - return pid; -diff --git build/configs/artik053/artik053_download.sh build/configs/artik053/artik053_download.sh -index 711d131..7f8eee0 100755 ---- build/configs/artik053/artik053_download.sh -+++ build/configs/artik053/artik053_download.sh -@@ -72,6 +72,7 @@ main() - flash_write sssfw ../../bin/sssfw.bin; \ - flash_write wlanfw ../../bin/wlanfw.bin; \ - flash_write os ../../../../output/bin/tinyara_head.bin; \ -+ flash_write rom ../../../../output/bin/rom.img; \ - exit' - popd - ;; -diff --git build/configs/artik053/tools/openocd/partition_map.cfg build/configs/artik053/tools/openocd/partition_map.cfg -index 10455a4..8f66487 100644 ---- build/configs/artik053/tools/openocd/partition_map.cfg -+++ build/configs/artik053/tools/openocd/partition_map.cfg -@@ -11,7 +11,8 @@ set partition_list { - os { "OS" 0x040C8000 0x00258000 0 } - factory { "Factory Reset" 0x04320000 0x00180000 0 } - ota { "OTA download" 0x044A0000 0x00180000 0 } -- user { "USER R/W" 0x04620000 0x0015E000 0 } -+ user { "USER R/W" 0x04620000 0x000FA000 0 } -+ rom { "ROM FS" 0x0471A000 0x00064000 0 } - nvram { "WiFi NVRAM" 0x0477E000 0x00002000 1 } - sssrw { "SSS R/W Key" 0x04780000 0x00080000 1 } - }