Skip to contentSkip to conversation

travis: Remove or32 toolchain info

PATCH New Bin Meng 2 participants 7 messages Oct 8, 2018 – Oct 20, 2018

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/2 travis: Remove or32 toolchain info

or32 is not supported by U-Boot anymore.

---

 .travis.yml | 1 -
 1 file changed, 1 deletion(-)
.travis.yml +0 -1
index 2b759c9..c0154da 100644
@@ -66,7 +66,6 @@ before_script:
   - if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi
   - 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}" == *sh* ]]; then ./tools/buildman/buildman --fetch-arch sh2 ; fi
   - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then
       ./tools/buildman/buildman --fetch-arch x86_64;
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/2 travis: Switch to i386 version toolchain for x86

Currently this uses x86_64 version toolchain for x86 build in travis-ci. Change it to i386 version to avoid updating the buildman toolchain path every time when the toolchain version number is changed, eg: from 7.3.0 to 8.1.0.

---

 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
.travis.yml +8 -8
index c0154da..b0b6f29 100644
@@ -67,9 +67,9 @@ 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}" == *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-7.3.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman;
+  - if [[ "${TOOLCHAIN}" == *i386* ]]; then
+      ./tools/buildman/buildman --fetch-arch i386;
+      echo -e "\n[toolchain-alias]\nx86 = i386" >> ~/.buildman;
     fi
   - if [[ "${TOOLCHAIN}" == arc ]]; then
        wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2017.09-release/arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install.tar.gz &&
@@ -207,7 +207,7 @@ matrix:
     - name: "buildman sandbox x86"
       env:
         - BUILDMAN="sandbox x86"
-          TOOLCHAIN="x86_64"
+          TOOLCHAIN="i386"
     - name: "buildman kirkwood (excluding openrd)"
       env:
         - BUILDMAN="kirkwood -x openrd"
@@ -320,19 +320,19 @@ matrix:
       env:
         - TEST_PY_BD="sandbox"
           BUILDMAN="^sandbox$"
-          TOOLCHAIN="x86_64"
+          TOOLCHAIN="i386"
     - name: "test/py sandbox_spl"
       env:
         - TEST_PY_BD="sandbox_spl"
           TEST_PY_TEST_SPEC="test_ofplatdata"
           BUILDMAN="^sandbox$"
-          TOOLCHAIN="x86_64"
+          TOOLCHAIN="i386"
           TEST_PY_TOOLS="yes"
     - name: "test/py sandbox_flattree"
       env:
         - TEST_PY_BD="sandbox_flattree"
           BUILDMAN="^sandbox_flattree$"
-          TOOLCHAIN="x86_64"
+          TOOLCHAIN="i386"
     - name: "test/py vexpress_ca15_tc2"
       env:
         - TEST_PY_BD="vexpress_ca15_tc2"
@@ -405,7 +405,7 @@ matrix:
           TEST_PY_TEST_SPEC="not sleep"
           QEMU_TARGET="i386-softmmu"
           BUILDMAN="^qemu-x86$"
-          TOOLCHAIN="x86_64"
+          TOOLCHAIN="i386"
           BUILD_ROM="yes"
     - name: "test/py zynq_zc702"
       env:
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 travis: Switch to i386 version toolchain for x86

Quoted 6 lines · Bin Meng

Currently this uses x86_64 version toolchain for x86 build in travis-ci. Change it to i386 version to avoid updating the buildman toolchain path every time when the toolchain version number is changed, eg: from 7.3.0 to 8.1.0.

I'm surprised this is fine, doesn't it break 64bit x86 targets?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181008/f9315858/attachment.sig>
author
#3 lore raw

PATCH 2/2 travis: Switch to i386 version toolchain for x86

Hi Tom,

Quoted 11 lines · Tom Rini
Quoted 6 lines · Bin Meng

Currently this uses x86_64 version toolchain for x86 build in travis-ci. Change it to i386 version to avoid updating the buildman toolchain path every time when the toolchain version number is changed, eg: from 7.3.0 to 8.1.0.

I'm surprised this is fine, doesn't it break 64bit x86 targets?

No, in fact I have always been using the i386 toolchain to test qemu-x86_64 target on my local machine. U-Boot x86 makefile fragments have been toolchain agnostic for some time.

Regards,
Bin

#4 lore raw

PATCH 2/2 travis: Switch to i386 version toolchain for x86

Quoted 11 lines · Bin Meng

Hi Tom,

Quoted 8 lines · Tom Rini
Quoted 5 lines · Bin Meng

Currently this uses x86_64 version toolchain for x86 build in travis-ci. Change it to i386 version to avoid updating the buildman toolchain path every time when the toolchain version number is changed, eg: from 7.3.0 to 8.1.0.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

I'm surprised this is fine, doesn't it break 64bit x86 targets?

No, in fact I have always been using the i386 toolchain to test qemu-x86_64 target on my local machine. U-Boot x86 makefile fragments have been toolchain agnostic for some time.

Ah, OK, thanks. Yes, this will make upgrades easier too.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181008/457c97ad/attachment.sig>
#5 lore raw

PATCH 2/2 travis: Switch to i386 version toolchain for x86

In reply to Bin Meng
Quoted 6 lines · Bin Meng

Currently this uses x86_64 version toolchain for x86 build in travis-ci. Change it to i386 version to avoid updating the buildman toolchain path every time when the toolchain version number is changed, eg: from 7.3.0 to 8.1.0.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181020/723b24a9/attachment.sig>
#6 lore raw

PATCH 1/2 travis: Remove or32 toolchain info

In reply to Bin Meng
Quoted 3 lines · Bin Meng

or32 is not supported by U-Boot anymore.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181020/dace09bf/attachment.sig>