j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: j3d1:master
Branches Tags
j3d1:master
j3d1:j3d1/dhcp_hostname
j3d1:feature/travis-tests-integration
j3d1:open-libmain-prerebase
j3d1:mqtt_cleanup
j3d1:fix/static_ctor
j3d1:fix/travis
j3d1:feature/tests
j3d1:experiments/get_station_info
j3d1:feature/assemble-sdk
j3d1:0.0.1
...
pull from: j3d1:fix/travis
Branches Tags
j3d1:j3d1/dhcp_hostname
j3d1:master
j3d1:feature/travis-tests-integration
j3d1:open-libmain-prerebase
j3d1:mqtt_cleanup
j3d1:fix/static_ctor
j3d1:fix/travis
j3d1:feature/tests
j3d1:experiments/get_station_info
j3d1:feature/assemble-sdk
j3d1:0.0.1

1 commit
master ... fix/travis

Author SHA1 Message Date
Angus Gratton
de4465b35d Switch Travis to latest esp-open-sdk, remove STANDALONE=n workaround 
Reverts workaround in previous commit a97fb7526. See discussion in #126
 2016-04-15 10:52:05 +10:00
2 changed files with 3 additions and 3 deletions
Show stats Expand all files Collapse all files

4
.travis.yml
View file

@ -2,7 +2,7 @@ language: c
sudo: false sudo: false
env: env:
# Target commit for https://github.com/pfalcon/esp-open-sdk/ # Target commit for https://github.com/pfalcon/esp-open-sdk/
OPENSDK_COMMIT=e33c0ad3 OPENSDK_COMMIT=cfe15bd
CROSS_ROOT="${HOME}/toolchain-${OPENSDK_COMMIT}" CROSS_ROOT="${HOME}/toolchain-${OPENSDK_COMMIT}"
CROSS_BINDIR="${CROSS_ROOT}/bin" CROSS_BINDIR="${CROSS_ROOT}/bin"
ESPTOOL2_COMMIT=ec0e2c7 ESPTOOL2_COMMIT=ec0e2c7
@ -47,7 +47,7 @@ before_install:
- ${HAS_TC} || git submodule update - ${HAS_TC} || git submodule update
- ${HAS_TC} || sed -i "s/2.69/2.68/" lx106-hal/configure.ac # this is a nasty hack as Ubuntu Precise only has autoconf 2.68 not 2.69... - ${HAS_TC} || sed -i "s/2.69/2.68/" lx106-hal/configure.ac # this is a nasty hack as Ubuntu Precise only has autoconf 2.68 not 2.69...
- ${HAS_TC} || sed -r -i 's%TOOLCHAIN ?=.*%TOOLCHAIN=${CROSS_ROOT}%' Makefile - ${HAS_TC} || sed -r -i 's%TOOLCHAIN ?=.*%TOOLCHAIN=${CROSS_ROOT}%' Makefile
- ${HAS_TC} || make toolchain esptool libhal STANDALONE=n - ${HAS_TC} || make STANDALONE=n
- export HAS_ET2="test -f ${ESPTOOL2_DIR}/esptool2" - export HAS_ET2="test -f ${ESPTOOL2_DIR}/esptool2"
- ${HAS_ET2} || git clone https://github.com/raburton/esptool2 ${ESPTOOL2_DIR} - ${HAS_ET2} || git clone https://github.com/raburton/esptool2 ${ESPTOOL2_DIR}
- ${HAS_ET2} || cd ${ESPTOOL2_DIR} - ${HAS_ET2} || cd ${ESPTOOL2_DIR}

2
README.md
View file

@ -18,7 +18,7 @@ Please note that this project is released with a [Contributor Code of Conduct](h
## Quick Start ## Quick Start
* Install [esp-open-sdk](https://github.com/pfalcon/esp-open-sdk/), build it with `make toolchain esptool libhal STANDALONE=n`, then edit your PATH and add the generated toolchain `bin` directory. The path will be something like `/path/to/esp-open-sdk/xtensa-lx106-elf/bin`. (Despite the similar name esp-open-sdk has different maintainers - but we think it's fantastic!) * Install [esp-open-sdk](https://github.com/pfalcon/esp-open-sdk/), build it with `make STANDALONE=n`, then edit your PATH and add the generated toolchain `bin` directory. The path will be something like `/path/to/esp-open-sdk/xtensa-lx106-elf/bin`. (Despite the similar name esp-open-sdk has different maintainers - but we think it's fantastic!)
(Other toolchains may also work, as long as a gcc cross-compiler is available on the PATH and libhal (and libhal headers) are compiled and available to gcc. The proprietary Tensilica "xcc" compiler will probably not work.) (Other toolchains may also work, as long as a gcc cross-compiler is available on the PATH and libhal (and libhal headers) are compiled and available to gcc. The proprietary Tensilica "xcc" compiler will probably not work.)