* [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue
@ 2023-07-14 0:37 Tom Rini
2023-07-14 0:37 ` [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype Tom Rini
` (4 more replies)
0 siblings, 5 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-14 0:37 UTC (permalink / raw)
To: u-boot; +Cc: Aaron Williams, Stefan Roese
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.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Aaron Williams <awilliams@marvell.com>
Cc: Stefan Roese <sr@denx.de>
---
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(-)
diff --git a/arch/mips/mach-octeon/cvmx-pko3-queue.c b/arch/mips/mach-octeon/cvmx-pko3-queue.c
index e28afdf8dd9d..53f2e4dd1861 100644
--- a/arch/mips/mach-octeon/cvmx-pko3-queue.c
+++ b/arch/mips/mach-octeon/cvmx-pko3-queue.c
@@ -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.
*
diff --git a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h
index b3f61d75f225..3931191fe20f 100644
--- a/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h
+++ b/arch/mips/mach-octeon/include/mach/cvmx-pko3-queue.h
@@ -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);
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype
2023-07-14 0:37 [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
@ 2023-07-14 0:37 ` Tom Rini
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 3/5] spl: Correct spl_board_boot_device " Tom Rini
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Tom Rini @ 2023-07-14 0:37 UTC (permalink / raw)
To: u-boot
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 <trini@konsulko.com>
---
arch/arm/include/asm/arch-mx5/clock.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h
index 63a51042e1eb..d585b5cf4b22 100644
--- a/arch/arm/include/asm/arch-mx5/clock.h
+++ b/arch/arm/include/asm/arch-mx5/clock.h
@@ -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);
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/5] spl: Correct spl_board_boot_device function prototype
2023-07-14 0:37 [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
2023-07-14 0:37 ` [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype Tom Rini
@ 2023-07-14 0:37 ` Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 4/5] CI: Update to gcc-13.1.0 Tom Rini
` (2 subsequent siblings)
4 siblings, 2 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-14 0:37 UTC (permalink / raw)
To: u-boot
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 <trini@konsulko.com>
---
include/spl.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/spl.h b/include/spl.h
index 658d36481dee..92bcaa90a4af 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -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
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 4/5] CI: Update to gcc-13.1.0
2023-07-14 0:37 [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
2023-07-14 0:37 ` [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype Tom Rini
2023-07-14 0:37 ` [PATCH 3/5] spl: Correct spl_board_boot_device " Tom Rini
@ 2023-07-14 0:37 ` Tom Rini
2023-07-14 13:52 ` Alexey Brodkin
` (2 more replies)
2023-07-14 0:37 ` [PATCH 5/5] CI: Update to the latest "Jammy" tag Tom Rini
2023-07-21 1:30 ` [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
4 siblings, 3 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-14 0:37 UTC (permalink / raw)
To: u-boot; +Cc: Alexey Brodkin, Heinrich Schuchardt
As this is the current version of the public cross toolchains we use,
upgrade to this now.
Suggested-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
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(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 76982ec3e52e..83cc6176e7b4 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -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
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7ffb8f5dfdc..5300813cf511 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 0ecd8458b912..1001b612086f 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -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)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index f72cba0b8cc4..2f2ace2e6554 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -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
+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
# Manually install other toolchains
RUN wget -O - https://github.com/foss-xtensa/toolchain/releases/download/2020.07/x86_64-2020.07-xtensa-dc233c-elf.tar.gz | tar -C /opt -xz
@@ -129,15 +129,16 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
git config --global user.name "GitLab CI Runner" && \
git config --global user.email trini@konsulko.com && \
git cherry-pick 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 && \
+ git cherry-pick 403d6540cd608b2706cfa0cb4713f7e4b490ff45 && \
./bootstrap && \
mkdir -p /opt/grub && \
./configure --target=aarch64 --with-platform=efi \
CC=gcc \
- TARGET_CC=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \
- TARGET_OBJCOPY=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \
- TARGET_STRIP=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \
- TARGET_NM=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \
- TARGET_RANLIB=/opt/gcc-12.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \
+ TARGET_CC=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \
+ TARGET_OBJCOPY=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \
+ TARGET_STRIP=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \
+ TARGET_NM=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \
+ TARGET_RANLIB=/opt/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \
make && \
./grub-mkimage -O arm64-efi -o /opt/grub/grubaa64.efi --prefix= -d \
grub-core cat chain configfile echo efinet ext2 fat halt help linux \
@@ -147,11 +148,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
make clean && \
./configure --target=arm --with-platform=efi \
CC=gcc \
- TARGET_CC=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \
- TARGET_OBJCOPY=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \
- TARGET_STRIP=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \
- TARGET_NM=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \
- TARGET_RANLIB=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \
+ TARGET_CC=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \
+ TARGET_OBJCOPY=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy \
+ TARGET_STRIP=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip \
+ TARGET_NM=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \
+ TARGET_RANLIB=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib && \
make && \
./grub-mkimage -O arm-efi -o /opt/grub/grubarm.efi --prefix= -d \
grub-core cat chain configfile echo efinet ext2 fat halt help linux \
@@ -161,11 +162,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
make clean && \
./configure --target=riscv64 --with-platform=efi \
CC=gcc \
- TARGET_CC=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \
- TARGET_OBJCOPY=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \
- TARGET_STRIP=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \
- TARGET_NM=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \
- TARGET_RANLIB=/opt/gcc-12.2.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \
+ TARGET_CC=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \
+ TARGET_OBJCOPY=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \
+ TARGET_STRIP=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \
+ TARGET_NM=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \
+ TARGET_RANLIB=/opt/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \
make && \
./grub-mkimage -O riscv64-efi -o /opt/grub/grubriscv64.efi --prefix= -d \
grub-core cat chain configfile echo efinet ext2 fat halt help linux \
@@ -276,7 +277,7 @@ RUN virtualenv -p /usr/bin/python3 /tmp/venv && \
# Create the buildman config file
RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman
-RUN /bin/echo -e "kernelorg = /opt/gcc-12.2.0-nolibc/*" >> ~/.buildman
+RUN /bin/echo -e "kernelorg = /opt/gcc-13.1.0-nolibc/*" >> ~/.buildman
RUN /bin/echo -e "arc = /opt/arc_gnu_2021.03_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman
RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman;
RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 5/5] CI: Update to the latest "Jammy" tag
2023-07-14 0:37 [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
` (2 preceding siblings ...)
2023-07-14 0:37 ` [PATCH 4/5] CI: Update to gcc-13.1.0 Tom Rini
@ 2023-07-14 0:37 ` Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-21 1:30 ` [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
4 siblings, 2 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-14 0:37 UTC (permalink / raw)
To: u-boot
Move to the latest "Jammy" tag from Ubuntu.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
.azure-pipelines.yml | 2 +-
.gitlab-ci.yml | 2 +-
tools/docker/Dockerfile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 83cc6176e7b4..929c8797d5eb 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -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.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5300813cf511..3017df51ff75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 2f2ace2e6554..7792fb0f3a38 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -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 <trini@konsulko.com>
LABEL Description=" This image is for building U-Boot inside a container"
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] CI: Update to gcc-13.1.0
2023-07-14 0:37 ` [PATCH 4/5] CI: Update to gcc-13.1.0 Tom Rini
@ 2023-07-14 13:52 ` Alexey Brodkin
2023-07-14 14:13 ` Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2 siblings, 1 reply; 15+ messages in thread
From: Alexey Brodkin @ 2023-07-14 13:52 UTC (permalink / raw)
To: Tom Rini; +Cc: Heinrich Schuchardt, u-boot
Hi Tom,
> As this is the current version of the public cross toolchains we use,
> upgrade to this now.
>
> Suggested-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
>
> 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----------------------
> ---
> .azure-pipelines.yml | 2 +-
> .gitlab-ci.yml | 2 +-
> tools/buildman/toolchain.py | 2 +-
> tools/docker/Dockerfile | 57 +++++++++++++++++++------------------
> 4 files changed, 32 insertions(+), 31 deletions(-)
>
> diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
> index 76982ec3e52e..83cc6176e7b4 100644
> --- a/.azure-pipelines.yml
> +++ b/.azure-pipelines.yml
> @@ -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
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index f7ffb8f5dfdc..5300813cf511 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -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
> diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
> index 0ecd8458b912..1001b612086f 100644
> --- a/tools/buildman/toolchain.py
> +++ b/tools/buildman/toolchain.py
> @@ -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)
> diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
> index f72cba0b8cc4..2f2ace2e6554 100644
> --- a/tools/docker/Dockerfile
> +++ b/tools/docker/Dockerfile
> @@ -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
> +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...
Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
-Alexey
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] CI: Update to gcc-13.1.0
2023-07-14 13:52 ` Alexey Brodkin
@ 2023-07-14 14:13 ` Tom Rini
0 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-14 14:13 UTC (permalink / raw)
To: Alexey Brodkin; +Cc: Heinrich Schuchardt, u-boot
[-- Attachment #1: Type: text/plain, Size: 7756 bytes --]
On Fri, Jul 14, 2023 at 01:52:09PM +0000, Alexey Brodkin wrote:
> Hi Tom,
>
> > As this is the current version of the public cross toolchains we use,
> > upgrade to this now.
> >
> > Suggested-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> > ---
> > Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
> >
> > 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----------------------
Yup, but since it's been solved upstream it's an easy fix, if 2.06 is
the right one to keep for now.
> > ---
> > .azure-pipelines.yml | 2 +-
> > .gitlab-ci.yml | 2 +-
> > tools/buildman/toolchain.py | 2 +-
> > tools/docker/Dockerfile | 57 +++++++++++++++++++------------------
> > 4 files changed, 32 insertions(+), 31 deletions(-)
> >
> > diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
> > index 76982ec3e52e..83cc6176e7b4 100644
> > --- a/.azure-pipelines.yml
> > +++ b/.azure-pipelines.yml
> > @@ -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
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index f7ffb8f5dfdc..5300813cf511 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -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
> > diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
> > index 0ecd8458b912..1001b612086f 100644
> > --- a/tools/buildman/toolchain.py
> > +++ b/tools/buildman/toolchain.py
> > @@ -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)
> > diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
> > index f72cba0b8cc4..2f2ace2e6554 100644
> > --- a/tools/docker/Dockerfile
> > +++ b/tools/docker/Dockerfile
> > @@ -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
> > +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...
>
> Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
I figured I'd just do the slight rebase of your patch when merging all
of these.
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] CI: Update to gcc-13.1.0
2023-07-14 0:37 ` [PATCH 4/5] CI: Update to gcc-13.1.0 Tom Rini
2023-07-14 13:52 ` Alexey Brodkin
@ 2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-07-15 23:40 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Alexey Brodkin, Heinrich Schuchardt
On Thu, 13 Jul 2023 at 18:38, Tom Rini <trini@konsulko.com> wrote:
>
> As this is the current version of the public cross toolchains we use,
> upgrade to this now.
>
> Suggested-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
>
> 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(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/5] spl: Correct spl_board_boot_device function prototype
2023-07-14 0:37 ` [PATCH 3/5] spl: Correct spl_board_boot_device " Tom Rini
@ 2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-07-15 23:40 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot
On Thu, 13 Jul 2023 at 18:38, Tom Rini <trini@konsulko.com> wrote:
>
> 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 <trini@konsulko.com>
> ---
> include/spl.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/5] CI: Update to the latest "Jammy" tag
2023-07-14 0:37 ` [PATCH 5/5] CI: Update to the latest "Jammy" tag Tom Rini
@ 2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Simon Glass @ 2023-07-15 23:40 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot
On Thu, 13 Jul 2023 at 18:38, Tom Rini <trini@konsulko.com> wrote:
>
> Move to the latest "Jammy" tag from Ubuntu.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> .azure-pipelines.yml | 2 +-
> .gitlab-ci.yml | 2 +-
> tools/docker/Dockerfile | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue
2023-07-14 0:37 [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
` (3 preceding siblings ...)
2023-07-14 0:37 ` [PATCH 5/5] CI: Update to the latest "Jammy" tag Tom Rini
@ 2023-07-21 1:30 ` Tom Rini
4 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-21 1:30 UTC (permalink / raw)
To: u-boot; +Cc: Aaron Williams, Stefan Roese
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
On Thu, Jul 13, 2023 at 08:37:32PM -0400, Tom Rini wrote:
> 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.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype
2023-07-14 0:37 ` [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype Tom Rini
@ 2023-07-21 1:30 ` Tom Rini
0 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-21 1:30 UTC (permalink / raw)
To: u-boot
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
On Thu, Jul 13, 2023 at 08:37:33PM -0400, Tom Rini wrote:
> 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 <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/5] spl: Correct spl_board_boot_device function prototype
2023-07-14 0:37 ` [PATCH 3/5] spl: Correct spl_board_boot_device " Tom Rini
2023-07-15 23:40 ` Simon Glass
@ 2023-07-21 1:30 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-21 1:30 UTC (permalink / raw)
To: u-boot
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
On Thu, Jul 13, 2023 at 08:37:34PM -0400, Tom Rini wrote:
> 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 <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] CI: Update to gcc-13.1.0
2023-07-14 0:37 ` [PATCH 4/5] CI: Update to gcc-13.1.0 Tom Rini
2023-07-14 13:52 ` Alexey Brodkin
2023-07-15 23:40 ` Simon Glass
@ 2023-07-21 1:30 ` Tom Rini
2 siblings, 0 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-21 1:30 UTC (permalink / raw)
To: u-boot; +Cc: Alexey Brodkin, Heinrich Schuchardt
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
On Thu, Jul 13, 2023 at 08:37:35PM -0400, Tom Rini wrote:
> As this is the current version of the public cross toolchains we use,
> upgrade to this now.
>
> Suggested-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/5] CI: Update to the latest "Jammy" tag
2023-07-14 0:37 ` [PATCH 5/5] CI: Update to the latest "Jammy" tag Tom Rini
2023-07-15 23:40 ` Simon Glass
@ 2023-07-21 1:30 ` Tom Rini
1 sibling, 0 replies; 15+ messages in thread
From: Tom Rini @ 2023-07-21 1:30 UTC (permalink / raw)
To: u-boot
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
On Thu, Jul 13, 2023 at 08:37:36PM -0400, Tom Rini wrote:
> Move to the latest "Jammy" tag from Ubuntu.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-07-21 1:31 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-14 0:37 [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
2023-07-14 0:37 ` [PATCH 2/5] arm: mx5: Correct mxc_set_clock function prototype Tom Rini
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 3/5] spl: Correct spl_board_boot_device " Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 4/5] CI: Update to gcc-13.1.0 Tom Rini
2023-07-14 13:52 ` Alexey Brodkin
2023-07-14 14:13 ` Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-14 0:37 ` [PATCH 5/5] CI: Update to the latest "Jammy" tag Tom Rini
2023-07-15 23:40 ` Simon Glass
2023-07-21 1:30 ` Tom Rini
2023-07-21 1:30 ` [PATCH 1/5] mips: octeon: Correct types in cvmx-pko3-queue Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.