mips: octeon: Correct types in cvmx-pko3-queue
Subsystems (2)
PATCH 1/5 mips: octeon: Correct types in cvmx-pko3-queue
When building with gcc-13.1 we see that the prototype for cvmx_pko3_sq_config_children does not match the declaration. Make these match and correct a typo in the function's version of the docs that the prototype did not have, as part of keeping those in-sync.
---
Cc: Aaron Williams <[email protected]>
Cc: Stefan Roese <[email protected]>
--- arch/mips/mach-octeon/cvmx-pko3-queue.c | 2 +- .../mips/mach-octeon/include/mach/cvmx-pko3-queue.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
arch/mips/mach-octeon/cvmx-pko3-queue.c +1 -1
@@ -761,7 +761,7 @@ int cvmx_pko3_pq_config(unsigned int node, unsigned int mac_num,* The Scheduler Queues in Levels 3 to 5 and Descriptor Queues are * configured one-to-one or many-to-one to a single parent Scheduler * Queues. The level of the parent SQ is specified in an argument, -* as well as the number of childer to attach to the specific parent. +* as well as the number of children to attach to the specific parent. * The children can have fair round-robin or priority-based scheduling * when multiple children are assigned a single parent. *
arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h +8 -5
@@ -6,6 +6,8 @@#ifndef __CVMX_PKO3_QUEUE_H__#define __CVMX_PKO3_QUEUE_H__ +enum cvmx_pko3_level_e ; +/** * @INTERNAL *
@@ -46,11 +48,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index);* The children can have fair round-robin or priority-based scheduling * when multiple children are assigned a single parent. * -* @param node is the OCI node location for the queues to be configured -* @param parent_level is the level of the parent queue, 2 to 5. +* @param node on which to operate +* @param child_level is the level of the child queue * @param parent_queue is the number of the parent Scheduler Queue * @param child_base is the number of the first child SQ or DQ to assign to -* @param parent * @param child_count is the number of consecutive children to assign * @param stat_prio_count is the priority setting for the children L2 SQs *
@@ -65,8 +66,10 @@ int cvmx_pko3_get_port_queue(int xiface, int index);* * Note: this function supports the configuration of node-local unit. */ -int cvmx_pko3_sq_config_children (unsigned int node,unsigned int parent_level, -unsigned int parent_queue,unsigned int child_base, +int cvmx_pko3_sq_config_children (unsigned int node, +enum cvmx_pko3_level_e child_level, +unsigned int parent_queue, +unsigned int child_base,unsigned int child_count,int stat_prio_count);/*
Signature · 1 line
2.34.1
PATCH 2/5 arm: mx5: Correct mxc_set_clock function prototype
With gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation.
--- arch/arm/include/asm/arch-mx5/clock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx5/clock.h +1 -1
@@ -42,7 +42,7 @@ enum mxc_clock {u32 imx_get_uartclk (void );u32 imx_get_fecclk (void );unsigned int mxc_get_clock (enum mxc_clock clk); -int mxc_set_clock (u32 ref,u32 freq,u32 clk_type); +int mxc_set_clock (u32 ref,u32 freq,enum mxc_clock clk);void set_usb_phy_clk (void );void enable_usb_phy1_clk (bool enable);void enable_usb_phy2_clk (bool enable);
Signature · 1 line
2.34.1
Re: [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype
Quoted 4 lines · Tom Rini
With gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 3/5 spl: Correct spl_board_boot_device function prototype
In reply to Tom RiniWith gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation.
--- include/spl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/spl.h +2 -1
@@ -31,6 +31,7 @@ struct legacy_img_hdr;struct blk_desc ;struct legacy_img_hdr ;struct spl_boot_device ; +enum boot_device ;/* * u_boot_first_phase() - check if this is the first U-Boot phase
@@ -525,7 +526,7 @@ void spl_board_prepare_for_linux(void);void spl_board_prepare_for_optee (void *fdt);void spl_board_prepare_for_boot (void );int spl_board_ubi_load_image (u32 boot_device); -int spl_board_boot_device (u32 boot_device); +int spl_board_boot_device (enum boot_device boot_dev_spl);/** * spl_board_loader_name() - Return a name for the loader
Signature · 1 line
2.34.1
Re: [PATCH 3/5] spl: Correct spl_board_boot_device function prototype
Quoted 9 lines · Tom Rini
With gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation.
Signed-off-by Tom Rini <[email protected]>--- include/spl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Re: [PATCH 3/5] spl: Correct spl_board_boot_device function prototype
In reply to Tom RiniQuoted 5 lines · Tom Rini
With gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation.
Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 4/5 CI: Update to gcc-13.1.0
In reply to Tom RiniAs this is the current version of the public cross toolchains we use, upgrade to this now.
---
Cc: Heinrich Schuchardt <[email protected]>
Heinrich, at this point is there a newer grub we should be testing? There's now 2 changes for RISC-V that we're cherry-picking for newer toolchains.
--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/buildman/toolchain.py | 2 +- tools/docker/Dockerfile | 57 +++++++++++++++++++------------------ 4 files changed, 32 insertions(+), 31 deletions(-)
.azure-pipelines.yml +1 -1
@@ -194,7 +194,7 @@ stages: ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/ - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH test/nokia_rx51_test.sh - job: pylint
.gitlab-ci.yml +1 -1
@@ -232,7 +232,7 @@ Run tests for Nokia RX-51 (aka N900): ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/; - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH; test/nokia_rx51_test.sh # Check for any pylint regressions
tools/buildman/toolchain.py +1 -1
@@ -499,7 +499,7 @@ class Toolchains: if arch == 'aarch64': arch = 'arm64' base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['12.2.0', '11.1.0'] + versions = ['13.1.0', '12.2.0'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version)
tools/docker/Dockerfile +29 -28
91 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH 4/5] CI: Update to gcc-13.1.0
Hi Tom,
Quoted 11 lines
As this is the current version of the public cross toolchains we use, upgrade to this now.
Suggested-by Alexey Brodkin <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Cc: Heinrich Schuchardt <[email protected]>Heinrich, at this point is there a newer grub we should be testing? There's now 2 changes for RISC-V that we're cherry-picking for newer toolchains.
That's what I noticed as well - grub fails to build for RISCV with the following message, I guess you saw that as well:
----------------------->8---------------------- ./grub-mkimage: error: relocation 0x13 is not implemented yet. ----------------------->8----------------------
Quoted 68 lines
--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/buildman/toolchain.py | 2 +- tools/docker/Dockerfile | 57 +++++++++++++++++++------------------ 4 files changed, 32 insertions(+), 31 deletions(-).azure-pipelines.yml +1
-1@@ -194,7 +194,7 @@ stages: ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/ - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH test/nokia_rx51_test.sh - job: pylint.gitlab-ci.yml +1
-1@@ -232,7 +232,7 @@ Run tests for Nokia RX-51 (aka N900): ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/; - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH; test/nokia_rx51_test.sh # Check for any pylint regressionstools/buildman/toolchain.py +1
-1@@ -499,7 +499,7 @@ class Toolchains: if arch == 'aarch64': arch = 'arm64' base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['12.2.0', '11.1.0'] + versions = ['13.1.0', '12.2.0'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version)tools/docker/Dockerfile +2
-12@@ -14,18 +14,18 @@ RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main | tee /etc/apt/sources.list.d/llvm.list -# Manually install the kernel.org "Crosstool" based toolchains for gcc-12.2.0 -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-arm-linux-gnueabi.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-i386-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-m68k-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-mips-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-microblaze-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-nios2-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-powerpc-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv64-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv32-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-sh2-linux.tar.xz | tar -C /opt -xJ +# Manually install the kernel.org "Crosstool" based toolchains for gcc-13.1.0 +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ
tools/docker/Dockerfile RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib · line 28
Quoted 10 lines
tools/docker/Dockerfile +10
-0+RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-arm-linux-gnueabi.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-i386-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-m68k-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-mips-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-microblaze-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-nios2-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-powerpc-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv64-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv32-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-sh2-linux.tar.xz | tar -C /opt -xJ
Maybe squash my ARC GNU toolchain removal from https://lists.denx.de/pipermail/u-boot/2023-July/521983.html here with use of GCC 13.1.0? I may do it as a follow-up patch as well if it loos more appropriate.
Otherwise, thanks for working on that change and...
-Alexey
Re: [PATCH 4/5] CI: Update to gcc-13.1.0
Quoted 14 lines · Alexey Brodkin
Hi Tom,
Quoted 11 lines
As this is the current version of the public cross toolchains we use, upgrade to this now.
Suggested-by Alexey Brodkin <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Cc: Heinrich Schuchardt <[email protected]>Heinrich, at this point is there a newer grub we should be testing? There's now 2 changes for RISC-V that we're cherry-picking for newer toolchains.
Quoted 5 lines
That's what I noticed as well - grub fails to build for RISCV with the following message, I guess you saw that as well:
----------------------->8---------------------- ./grub-mkimage: error: relocation0x13is not implemented yet. ----------------------->8----------------------
Yup, but since it's been solved upstream it's an easy fix, if 2.06 is the right one to keep for now.
Quoted 82 lines
Quoted 68 lines
--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/buildman/toolchain.py | 2 +- tools/docker/Dockerfile | 57 +++++++++++++++++++------------------ 4 files changed, 32 insertions(+), 31 deletions(-).azure-pipelines.yml +1
-1@@ -194,7 +194,7 @@ stages: ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/ ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/ - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH test/nokia_rx51_test.sh - job: pylint.gitlab-ci.yml +1
-1@@ -232,7 +232,7 @@ Run tests for Nokia RX-51 (aka N900): ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/; ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/; - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH; test/nokia_rx51_test.sh # Check for any pylint regressionstools/buildman/toolchain.py +1
-1@@ -499,7 +499,7 @@ class Toolchains: if arch == 'aarch64': arch = 'arm64' base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['12.2.0', '11.1.0'] + versions = ['13.1.0', '12.2.0'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version)tools/docker/Dockerfile +2
-12@@ -14,18 +14,18 @@ RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main | tee /etc/apt/sources.list.d/llvm.list -# Manually install the kernel.org "Crosstool" based toolchains for gcc-12.2.0 -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-arm-linux-gnueabi.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-i386-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-m68k-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-mips-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-microblaze-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-nios2-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-powerpc-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv64-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv32-linux.tar.xz | tar -C /opt -xJ -RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-sh2-linux.tar.xz | tar -C /opt -xJ +# Manually install the kernel.org "Crosstool" based toolchains for gcc-13.1.0 +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJtools/docker/Dockerfile RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib · line 28
Quoted 10 lines
tools/docker/Dockerfile +10
-0+RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-arm-linux-gnueabi.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-i386-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-m68k-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-mips-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-microblaze-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-nios2-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-powerpc-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv64-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv32-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-sh2-linux.tar.xz | tar -C /opt -xJMaybe squash my ARC GNU toolchain removal from https://lists.denx.de/pipermail/u-boot/2023-July/521983.html here with use of GCC 13.1.0? I may do it as a follow-up patch as well if it loos more appropriate.
Quoted 3 lines
Otherwise, thanks for working on that change and...
Acked-by Alexey Brodkin <[email protected]>
I figured I'd just do the slight rebase of your patch when merging all of these.
Signature · 1 line
Tom
Re: [PATCH 4/5] CI: Update to gcc-13.1.0
In reply to Tom RiniQuoted 12 lines · Tom Rini
As this is the current version of the public cross toolchains we use, upgrade to this now.
Suggested-by Alexey Brodkin <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Cc: Heinrich Schuchardt <[email protected]>Heinrich, at this point is there a newer grub we should be testing? There's now 2 changes for RISC-V that we're cherry-picking for newer toolchains.
Quoted 6 lines
--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/buildman/toolchain.py | 2 +- tools/docker/Dockerfile | 57 +++++++++++++++++++------------------ 4 files changed, 32 insertions(+), 31 deletions(-)
Re: [PATCH 4/5] CI: Update to gcc-13.1.0
In reply to Tom RiniQuoted 7 lines · Tom Rini
As this is the current version of the public cross toolchains we use, upgrade to this now.
Suggested-by Alexey Brodkin <[email protected]>Signed-off-by Tom Rini <[email protected]>Acked-by Alexey Brodkin <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 5/5 CI: Update to the latest "Jammy" tag
In reply to Tom RiniMove to the latest "Jammy" tag from Ubuntu.
--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
.azure-pipelines.yml +1 -1
@@ -2,7 +2,7 @@ variables: windows_vm: windows-2019 ubuntu_vm: ubuntu-22.04 macos_vm: macOS-12 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230308-04Apr2023 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230624-13Jul2023 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root.
.gitlab-ci.yml +1 -1
@@ -10,7 +10,7 @@ default: # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230308-04Apr2023 +image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230624-13Jul2023 # We run some tests in different order, to catch some failures quicker. stages:
tools/docker/Dockerfile +1 -1
@@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:jammy-20230308 +FROM ubuntu:jammy-20230624 MAINTAINER Tom Rini <[email protected]> LABEL Description=" This image is for building U-Boot inside a container"
Signature · 1 line
2.34.1
Re: [PATCH 5/5] CI: Update to the latest "Jammy" tag
Quoted 9 lines · Tom Rini
Move to the latest "Jammy" tag from Ubuntu.
Signed-off-by Tom Rini <[email protected]>--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Re: [PATCH 5/5] CI: Update to the latest "Jammy" tag
In reply to Tom RiniQuoted 4 lines · Tom Rini
Move to the latest "Jammy" tag from Ubuntu.
Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 6 lines · Tom Rini
When building with gcc-13.1 we see that the prototype for
cvmx_pko3_sq_config_childrendoes not match the declaration. Make these match and correct a typo in the function's version of the docs that the prototype did not have, as part of keeping those in-sync.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom