From de4465b35d6869cec92e6aa7040a9ba4ad78228c Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 15 Apr 2016 10:50:06 +1000 Subject: [PATCH] Switch Travis to latest esp-open-sdk, remove STANDALONE=n workaround Reverts workaround in previous commit a97fb7526. See discussion in #126 --- .travis.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5df0d6..9421674 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: c sudo: false env: # Target commit for https://github.com/pfalcon/esp-open-sdk/ - OPENSDK_COMMIT=e33c0ad3 + OPENSDK_COMMIT=cfe15bd CROSS_ROOT="${HOME}/toolchain-${OPENSDK_COMMIT}" CROSS_BINDIR="${CROSS_ROOT}/bin" ESPTOOL2_COMMIT=ec0e2c7 @@ -47,7 +47,7 @@ before_install: - ${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 -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" - ${HAS_ET2} || git clone https://github.com/raburton/esptool2 ${ESPTOOL2_DIR} - ${HAS_ET2} || cd ${ESPTOOL2_DIR} diff --git a/README.md b/README.md index 50edf61..f709216 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Please note that this project is released with a [Contributor Code of Conduct](h ## 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.)