| Message ID | 1518906642-13401-2-git-send-email-trini@konsulko.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/5] sh: Use -m2a-nofpu only | expand |
On 02/17/2018 11:30 PM, Tom Rini wrote: > With the switch to newer toolchains from kernel.org we can now fetch an > sh2 toolchain that will build for sh2/3/4, so switch to that. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > .travis.yml | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index 7b53b3dddc1b..a67d3c3dbab6 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -38,7 +38,7 @@ install: > - echo -e "aarch64 = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu" >> ~/.buildman > - echo -e "arm = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf" >> ~/.buildman > - echo -e "arc = /tmp/arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman > - - echo -e "\n[toolchain-alias]\nsh = sh4\nopenrisc = or32" >> ~/.buildman > + - echo -e "\n[toolchain-alias]\nsh = sh2\nopenrisc = or32" >> ~/.buildman > - cat ~/.buildman > - virtualenv /tmp/venv > - . /tmp/venv/bin/activate > @@ -63,7 +63,7 @@ before_script: > - if [[ "${TOOLCHAIN}" == *microblaze* ]]; then ./tools/buildman/buildman --fetch-arch microblaze ; fi > - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi > - if [[ "${TOOLCHAIN}" == *or32* ]]; then ./tools/buildman/buildman --fetch-arch or32 ; fi > - - if [[ "${TOOLCHAIN}" == *sh4* ]]; then ./tools/buildman/buildman --fetch-arch sh4 ; fi > + - if [[ "${TOOLCHAIN}" == *sh* ]]; then ./tools/buildman/buildman --fetch-arch sh2 ; fi > - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then > ./tools/buildman/buildman --fetch-arch x86_64; > echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; > @@ -268,8 +268,8 @@ matrix: > - env: > - BUILDMAN="rockchip" > - env: > - - BUILDMAN="sh4" > - TOOLCHAIN="sh4" > + - BUILDMAN="sh" > + TOOLCHAIN="sh" > - env: > - JOB="Xilinx (ARM)" > BUILDMAN="xilinx -x microblaze" > Applied, thanks
On Mon, Feb 19, 2018 at 05:43:18AM +0100, Marek Vasut wrote: > On 02/17/2018 11:30 PM, Tom Rini wrote: > > With the switch to newer toolchains from kernel.org we can now fetch an > > sh2 toolchain that will build for sh2/3/4, so switch to that. > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > --- > > .travis.yml | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/.travis.yml b/.travis.yml > > index 7b53b3dddc1b..a67d3c3dbab6 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -38,7 +38,7 @@ install: > > - echo -e "aarch64 = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu" >> ~/.buildman > > - echo -e "arm = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf" >> ~/.buildman > > - echo -e "arc = /tmp/arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman > > - - echo -e "\n[toolchain-alias]\nsh = sh4\nopenrisc = or32" >> ~/.buildman > > + - echo -e "\n[toolchain-alias]\nsh = sh2\nopenrisc = or32" >> ~/.buildman > > - cat ~/.buildman > > - virtualenv /tmp/venv > > - . /tmp/venv/bin/activate > > @@ -63,7 +63,7 @@ before_script: > > - if [[ "${TOOLCHAIN}" == *microblaze* ]]; then ./tools/buildman/buildman --fetch-arch microblaze ; fi > > - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi > > - if [[ "${TOOLCHAIN}" == *or32* ]]; then ./tools/buildman/buildman --fetch-arch or32 ; fi > > - - if [[ "${TOOLCHAIN}" == *sh4* ]]; then ./tools/buildman/buildman --fetch-arch sh4 ; fi > > + - if [[ "${TOOLCHAIN}" == *sh* ]]; then ./tools/buildman/buildman --fetch-arch sh2 ; fi > > - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then > > ./tools/buildman/buildman --fetch-arch x86_64; > > echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; > > @@ -268,8 +268,8 @@ matrix: > > - env: > > - BUILDMAN="rockchip" > > - env: > > - - BUILDMAN="sh4" > > - TOOLCHAIN="sh4" > > + - BUILDMAN="sh" > > + TOOLCHAIN="sh" > > - env: > > - JOB="Xilinx (ARM)" > > BUILDMAN="xilinx -x microblaze" > > > Applied, thanks Sorry, I should have put some comments below the commit on this one. It depends on Daniel's patches that fix some other issues so that we can use the newer toolchains first.
diff --git a/.travis.yml b/.travis.yml index 7b53b3dddc1b..a67d3c3dbab6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - echo -e "aarch64 = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu" >> ~/.buildman - echo -e "arm = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf" >> ~/.buildman - echo -e "arc = /tmp/arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman - - echo -e "\n[toolchain-alias]\nsh = sh4\nopenrisc = or32" >> ~/.buildman + - echo -e "\n[toolchain-alias]\nsh = sh2\nopenrisc = or32" >> ~/.buildman - cat ~/.buildman - virtualenv /tmp/venv - . /tmp/venv/bin/activate @@ -63,7 +63,7 @@ before_script: - if [[ "${TOOLCHAIN}" == *microblaze* ]]; then ./tools/buildman/buildman --fetch-arch microblaze ; fi - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi - if [[ "${TOOLCHAIN}" == *or32* ]]; then ./tools/buildman/buildman --fetch-arch or32 ; fi - - if [[ "${TOOLCHAIN}" == *sh4* ]]; then ./tools/buildman/buildman --fetch-arch sh4 ; fi + - if [[ "${TOOLCHAIN}" == *sh* ]]; then ./tools/buildman/buildman --fetch-arch sh2 ; fi - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then ./tools/buildman/buildman --fetch-arch x86_64; echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; @@ -268,8 +268,8 @@ matrix: - env: - BUILDMAN="rockchip" - env: - - BUILDMAN="sh4" - TOOLCHAIN="sh4" + - BUILDMAN="sh" + TOOLCHAIN="sh" - env: - JOB="Xilinx (ARM)" BUILDMAN="xilinx -x microblaze"
With the switch to newer toolchains from kernel.org we can now fetch an sh2 toolchain that will build for sh2/3/4, so switch to that. Signed-off-by: Tom Rini <trini@konsulko.com> --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)