xtensa toolchains are core-specific, so give full toolchain name and download corresponding prebuilt toolchain from the github release.

Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml index 2a98c4bb11cc..8e96a269299f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,11 @@ before_script: wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/d... && tar -C /tmp -xf arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install.tar.gz; fi - - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then ./tools/buildman/buildman --fetch-arch xtensa ; fi + - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then + wget https://github.com/foss-xtensa/toolchain/releases/download/2018.02/x86_64-20... && + tar -C /tmp -xf x86_64-2018.02-${TOOLCHAIN}.tar.gz && + echo -e "\n[toolchain-prefix]\nxtensa = /tmp/2018.02/${TOOLCHAIN}/bin/${TOOLCHAIN}-" >> ~/.buildman; + fi # If TOOLCHAIN is unset, we're on some flavour of ARM. - if [[ "${TOOLCHAIN}" == "" ]]; then wget http://releases.linaro.org/components/toolchain/binaries/6.3-2017.02/aarch64... && @@ -272,7 +276,7 @@ matrix: BUILDMAN="xilinx -x microblaze" - env: - BUILDMAN="xtensa" - TOOLCHAIN="xtensa" + TOOLCHAIN="xtensa-dc233c-elf" - env: - BUILDMAN="riscv" TOOLCHAIN="riscv"

Remove CONFIG_BOOT_RETRY_TIME as it doesn't do much good and enable CONFIG_HUSH_PARSER in xtfpga_defconfig.

Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- Changes v1->v2: - new patch

configs/xtfpga_defconfig | 1 + include/configs/xtfpga.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index 4f77e23ef5c5..759b4a5524f7 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_CPU="dc233c" CONFIG_XTFPGA_KC705=y CONFIG_BOOTDELAY=10 CONFIG_VERSION_VARIABLE=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press <SPACE> to stop\n" diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 3119f007971e..79cc1e8fc1b8 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -122,8 +122,6 @@ /* U-Boot autoboot configuration */ /*==============================*/

-#define CONFIG_BOOT_RETRY_TIME 60 /* retry after 60 secs */ - #define CONFIG_AUTO_COMPLETE /* Support tab autocompletion */ #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP

This allows running tests on emulated KC705 board with DC233C xtensa core. It expects to find conf.xtfpga_qemu in the uboot-test-hooks.

Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml index 8e96a269299f..2c1b11dd81d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -389,5 +389,12 @@ matrix: QEMU_TARGET="arm-softmmu" TEST_PY_ID="--id qemu" BUILDMAN="^zynq_zc702$" + - env: + - TEST_PY_BD="xtfpga" + TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="xtensa-softmmu" + TEST_PY_ID="--id qemu" + BUILDMAN="^xtfpga$" + TOOLCHAIN="xtensa-dc233c-elf"

# TODO make it perfect ;-r