[U-Boot] [PATCH 1/2] travis: Remove or32 toolchain info

[U-Boot] [PATCH 1/2] travis: Remove or32 toolchain info

[Bin Meng]

or32 is not supported by U-Boot anymore.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2b759c9..c0154da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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;
-- 
2.7.4

[U-Boot] [PATCH 2/2] travis: Switch to i386 version toolchain for x86

[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.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 .travis.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0154da..b0b6f29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
-- 
2.7.4

[U-Boot] [PATCH 2/2] travis: Switch to i386 version toolchain for x86

[Tom Rini]

On Mon, Oct 08, 2018 at 04:53:54PM -0700, Bin Meng wrote:

> 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.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

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

-- 
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>

[U-Boot] [PATCH 2/2] travis: Switch to i386 version toolchain for x86

[Bin Meng]

Hi Tom,

On Tue, Oct 9, 2018 at 7:53 AM Tom Rini <trini@konsulko.com> wrote:
>
> On Mon, Oct 08, 2018 at 04:53:54PM -0700, Bin Meng wrote:
>
> > 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.
> >
> > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>
> 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

[U-Boot] [PATCH 2/2] travis: Switch to i386 version toolchain for x86

[Tom Rini]

On Tue, Oct 09, 2018 at 09:21:05AM +0800, Bin Meng wrote:
> Hi Tom,
> 
> On Tue, Oct 9, 2018 at 7:53 AM Tom Rini <trini@konsulko.com> wrote:
> >
> > On Mon, Oct 08, 2018 at 04:53:54PM -0700, Bin Meng wrote:
> >
> > > 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.
> > >
> > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> >
> > 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.

-- 
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>

[U-Boot] [U-Boot, 2/2] travis: Switch to i386 version toolchain for x86

[Tom Rini]

On Mon, Oct 08, 2018 at 04:53:54PM -0700, Bin Meng wrote:

> 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.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot/master, thanks!

-- 
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>

[U-Boot] [U-Boot,1/2] travis: Remove or32 toolchain info

[Tom Rini]

On Mon, Oct 08, 2018 at 04:53:53PM -0700, Bin Meng wrote:

> or32 is not supported by U-Boot anymore.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot/master, thanks!

-- 
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>