Skip to content

Bump NuttX RTOS target to 7.27 #2696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akosthekiss merged 1 commit into from
Jan 15, 2019
Merged

Bump NuttX RTOS target to 7.27 #2696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion targets/nuttx-stm32f4/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ updateobjs:
cleanlibs: updateobjs
rm -f $(OBJS)

clean: cleanlibs
clean:: cleanlibs
Copy link
Contributor

@LaszloLango LaszloLango Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intentional? This looks accidental to me.

Copy link
Member Author

@akosthekiss akosthekiss Jan 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is intentional. NuttX makefiles have changed and the clean target became a double-colon rule. From the docs:

When a target appears in multiple rules, all the rules must be the same type: all ordinary, or all double-colon.

So, I had to update the clean rule here, too.


.built: $(LIBS) updateobjs

Expand Down
4 changes: 2 additions & 2 deletions targets/nuttx-stm32f4/Makefile.travis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ install-kconfig:

# Fetch nuttx/{apps,nuttx} repositories.
install-clone-nuttx:
git clone https://bitbucket.org/nuttx/apps.git ../apps -b nuttx-7.22
git clone https://bitbucket.org/nuttx/nuttx.git ../nuttx -b nuttx-7.22
git clone https://bitbucket.org/nuttx/apps.git ../apps -b nuttx-7.27
git clone https://bitbucket.org/nuttx/nuttx.git ../nuttx -b nuttx-7.27

# Perform all the necessary (JerryScript-independent) installation steps.
install-noapt: install-kconfig install-clone-nuttx
Expand Down
8 changes: 4 additions & 4 deletions targets/nuttx-stm32f4/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ This folder contains files to run JerryScript on

#### 1. Setup the build environment for STM32F4-Discovery board

Clone the necessary projects into a `jerry-nuttx` directory. The last tested working version of NuttX is 7.22.
Clone the necessary projects into a `jerry-nuttx` directory. The last tested working version of NuttX is 7.27.

```sh
# Create a base folder for all the projects.
mkdir jerry-nuttx && cd jerry-nuttx

git clone https://github.com/pando-project/jerryscript.git
git clone https://bitbucket.org/nuttx/nuttx.git -b nuttx-7.22
git clone https://bitbucket.org/nuttx/apps.git -b nuttx-7.22
git clone https://github.com/texane/stlink.git
git clone https://bitbucket.org/nuttx/nuttx.git -b nuttx-7.27
git clone https://bitbucket.org/nuttx/apps.git -b nuttx-7.27
git clone https://github.com/texane/stlink.git -b v1.5.1
```

The following directory structure is created after these commands:
Expand Down