Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
augustofg committed Feb 3, 2020
2 parents 9ab0103 + ecce3bb commit 9ab03d4
Show file tree
Hide file tree
Showing 72 changed files with 50,104 additions and 4 deletions.
23 changes: 22 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ First make sure you have installed on your system:
* arm-none-eabi-gcc
* arm-none-eabi-binutils
* arm-none-eabi-newlib
* kconfig-frontends - Can be obtained [here](https://bitbucket.org/nuttx/tools/src/master/)
* kconfig-frontends - See instructions bellow
* openocd

To build, you need to configure nuttx and start the compilation:
Expand All @@ -25,6 +25,27 @@ $ ./make.sh build

If everything goes well, the files ```nuttx/nuttx``` (elf with debug symbols) and ```nuttx/nuttx.bin``` (raw binary) will be available.

## Installing kconfig-frontends

An out-of-tree version of kconfig-frontends is provided under ```tools/kconfig-frontends```. To build it make sure you have the following tools installed on your system:
* automake
* autoconf
* m4
* flex
* bison
* gperf

Enter the ```tools/kconfig-frontends``` directory and execute:
```bash
$ aclocal
$ autoconf
$ automake
$ ./configure --prefix=your_prefix_path
$ make install
```

Make sure to include the ```your_prefix_path/usr/bin``` directory in your ```PATH``` environment variable.

## Flashing

The nuttx.bin image does not contains the bootloader and is expected to be loaded at 0x00010000, so if you are flashing blank uCs, flash the bootloader from legacy/bootloader first.
Expand Down
4 changes: 3 additions & 1 deletion make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ git_hash_tag() {
cd ..
RFFE_GIT_HASH=$(git describe --no-match --always --dirty --abbrev=40)
RFFE_GIT_TAG=$(git describe --exact-match --tags)
echo -e "/* Auto-generated file */\n\n#define APPS_GIT_HASH \"${APPS_GIT_HASH}\"\n#define NUTTX_GIT_HASH \"${NUTTX_GIT_HASH}\"\n#define RFFE_GIT_HASH \"${RFFE_GIT_HASH}\"\n#define RFFE_GIT_TAG \"${RFFE_GIT_TAG}\"\n" > rffe-app/git_version.h
printf "/* Auto-generated file */\n\n#define APPS_GIT_HASH \"${APPS_GIT_HASH}\"\n#define NUTTX_GIT_HASH \"${NUTTX_GIT_HASH}\"\n#define RFFE_GIT_HASH \"${RFFE_GIT_HASH}\"\n#define RFFE_GIT_TAG \"${RFFE_GIT_TAG}\"\n" > rffe-app/git_version.h
}

if [ -z "$JOBS" ]; then
Expand Down Expand Up @@ -43,4 +43,6 @@ elif test "$cmd" = "clean"; then
rm -f apps/external rffe-app/git_version.h
elif test "$cmd" = "flash"; then
openocd -f scripts/openocd/lpc17-cmsis.cfg -c "program nuttx/nuttx.bin 0x10000; reset; shutdown"
else
echo "Error: unknown command ${cmd}"
fi
6 changes: 4 additions & 2 deletions rffe-board/rffe/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,11 @@ CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_IFUPDOWN=y
CONFIG_NSH_DISABLE_MKRD=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_FILEIOSIZE=128
CONFIG_NSH_IOBUFFER_SIZE=128
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=1024
CONFIG_PHY_CEMENT_DISABLE=y
CONFIG_PREALLOC_MQ_MSGS=4
CONFIG_PREALLOC_TIMERS=4
Expand All @@ -94,7 +96,7 @@ CONFIG_START_DAY=20
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2010
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_NAME_SIZE=16
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_USER_ENTRYPOINT="rffe_startup"
CONFIG_WDOG_INTRESERVE=0
Expand Down
72 changes: 72 additions & 0 deletions tools/kconfig-frontends/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Created by https://www.gitignore.io/api/autotools
# Edit at https://www.gitignore.io/?templates=autotools

### Autotools ###
# http://www.gnu.org/software/automake

Makefile
Makefile.in
/ar-lib
/mdate-sh
/py-compile
/test-driver
/ylwrap

# http://www.gnu.org/software/autoconf

autom4te.cache
/autoscan.log
/autoscan-*.log
/aclocal.m4
/compile
/config.guess
/config.h.in
/config.log
/config.status
/config.sub
/configure
/configure.scan
/depcomp
/install-sh
/missing
/stamp-h1

# https://www.gnu.org/software/libtool/

/ltmain.sh

# http://www.gnu.org/software/texinfo

/texinfo.tex

# http://www.gnu.org/software/m4/

m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4

### Autotools Patch ###

# End of https://www.gitignore.io/api/autotools

.deps/
/libtool
.dirstamp
.libs/
frontends/conf/kconfig-conf
frontends/kconfig
frontends/mconf/kconfig-mconf
frontends/nconf/kconfig-nconf
frontends/qconf/kconfig-qconf
frontends/qconf/qconf.moc
libs/images/images.c
libs/images/images.h
libs/parser/hconf.c
libs/parser/yconf.c
libs/parser/kconfig-parser.pc
scripts/.autostuff/config.h
scripts/.autostuff/stamp-h1
utils/kconfig-gettext
utils/kconfig-tweak
2 changes: 2 additions & 0 deletions tools/kconfig-frontends/.version
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
4.11.0 a351e9b9fc24e982ec2f0e76379a49826036da12 Fearless Coyote
1
14 changes: 14 additions & 0 deletions tools/kconfig-frontends/AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Authors of kconfig-frontends.

The developers of the Linux kernel are the original authors of the kconfig
parser and frontends. The list is too long to reproduce here, but you can
get a pretty complete list from the Linux kernel repository logs:
git shortlog scripts/kconfig

The packaging uses the GNU autotools build system, of which I
will not try to list the many authors here.

The initial packaging was done by:
"Yann E. MORIN" <[email protected]>

For a complete list, see the commit-logs of the kconfig repository.
Loading

0 comments on commit 9ab03d4

Please sign in to comment.