mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-05-05 12:46:14 +02:00
Merge branch '2023-07-20-assorted-CI-updates'
- Move to gcc-13.1 and QEMU 8.0.3 in CI. This also lets us move to a kernel.org toolchain for arc as well.
This commit is contained in:
Tom Rini
commit
7fe5accb45
@ -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-20Jul2023
|
||||
# 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.
|
||||
@ -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
|
||||
@ -460,6 +460,7 @@ stages:
|
||||
fi
|
||||
# Some tests using libguestfs-tools need the fuse device to run
|
||||
docker run "$@" --device /dev/fuse:/dev/fuse -v $PWD:$(work_dir) $(ci_runner_image) /bin/bash $(work_dir)/test.sh
|
||||
retryCountOnTaskFailure: 2 # QEMU may be too slow, etc.
|
||||
|
||||
- stage: world_build
|
||||
jobs:
|
||||
@ -506,7 +507,7 @@ stages:
|
||||
imx:
|
||||
BUILDMAN: "mx -x mx6,imx8,freescale,technexion,toradex"
|
||||
imx8_imx9:
|
||||
BUILDMAN: "imx8 imx9"
|
||||
BUILDMAN: "imx8 imx9 -x engicam,technexion,toradex"
|
||||
keymile:
|
||||
BUILDMAN: "keymile"
|
||||
keystone2_keystone3:
|
||||
@ -563,10 +564,10 @@ stages:
|
||||
BUILDMAN: "uniphier"
|
||||
aarch64_catch_all:
|
||||
BUILDMAN: "aarch64 -x amlogic,bcm,imx8,imx9,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,renesas,sunxi,samsung,socfpga,rk,versal,zynq"
|
||||
rockchip_32bit:
|
||||
BUILDMAN: "rk -x aarch64"
|
||||
rockchip_64bit:
|
||||
BUILDMAN: "rk&aarch64"
|
||||
rk_rv_non_rockchip:
|
||||
BUILDMAN: "rk|rv -x rockchip"
|
||||
rk_rv_and_rockchip:
|
||||
BUILDMAN: "(rk|rv)&rockchip"
|
||||
renesas:
|
||||
BUILDMAN: "renesas"
|
||||
zynq:
|
||||
|
||||
@ -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-20Jul2023
|
||||
|
||||
# We run some tests in different order, to catch some failures quicker.
|
||||
stages:
|
||||
@ -20,6 +20,7 @@ stages:
|
||||
|
||||
.buildman_and_testpy_template: &buildman_and_testpy_dfn
|
||||
stage: test.py
|
||||
retry: 2 # QEMU may be too slow, etc.
|
||||
before_script:
|
||||
# Clone uboot-test-hooks
|
||||
- git config --global --add safe.directory "${CI_PROJECT_DIR}"
|
||||
@ -231,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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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.
|
||||
*
|
||||
|
||||
@ -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);
|
||||
|
||||
/*
|
||||
|
||||
@ -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
|
||||
|
||||
@ -91,7 +91,6 @@ other = /
|
||||
[toolchain-prefix]
|
||||
# name = path to prefix
|
||||
# e.g. x86 = /opt/gcc-4.6.3-nolibc/x86_64-linux/bin/x86_64-linux-
|
||||
# arc = /opt/arc/arc_gnu_2021.03_prebuilt_elf32_le_linux_install/bin/arc-elf32-
|
||||
|
||||
[toolchain-alias]
|
||||
# arch = alias
|
||||
|
||||
@ -475,10 +475,6 @@ Setting up
|
||||
sudo mkdir -p /toolchains
|
||||
sudo mv ~/.buildman-toolchains/*/* /toolchains/
|
||||
|
||||
For those not available from kernel.org, download from the following links:
|
||||
|
||||
- `Arc Toolchain`_
|
||||
|
||||
Buildman should now be set up to use your new toolchain.
|
||||
|
||||
At the time of writing, U-Boot has these architectures:
|
||||
@ -1342,8 +1338,6 @@ Thanks to Grant Grundler <grundler@chromium.org> for his ideas for improving
|
||||
the build speed by building all commits for a board instead of the other
|
||||
way around.
|
||||
|
||||
.. _`Arc Toolchain`: https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-release/arc_gnu_2021.03_prebuilt_elf32_le_linux_install.tar.gz
|
||||
|
||||
.. sectionauthor:: Simon Glass
|
||||
.. sectionauthor:: Copyright (c) 2013 The Chromium OS Authors.
|
||||
.. sectionauthor:: sjg@chromium.org
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -14,22 +14,22 @@ 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-arc-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
|
||||
RUN wget -O - https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2021.03-release/arc_gnu_2021.03_prebuilt_uclibc_le_archs_linux_install.tar.gz | tar --no-same-owner -C /opt -xz
|
||||
|
||||
# Update and install things from apt now
|
||||
RUN apt-get update && apt-get install -y \
|
||||
@ -77,6 +77,7 @@ RUN apt-get update && apt-get install -y \
|
||||
libsdl1.2-dev \
|
||||
libsdl2-dev \
|
||||
libseccomp-dev \
|
||||
libslirp-dev \
|
||||
libssl-dev \
|
||||
libtool \
|
||||
libudev-dev \
|
||||
@ -128,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 \
|
||||
@ -146,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 \
|
||||
@ -160,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 \
|
||||
@ -175,13 +177,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
|
||||
|
||||
RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
|
||||
cd /tmp/qemu && \
|
||||
git submodule update --init dtc && \
|
||||
git checkout v6.1.0 && \
|
||||
git checkout v8.0.3 && \
|
||||
# config user.name and user.email to make 'git am' happy
|
||||
git config user.name u-boot && \
|
||||
git config user.email u-boot@denx.de && \
|
||||
# manually apply the bug fix for QEMU 6.1.0 Xilinx Zynq UART emulation codes
|
||||
wget -O - http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/mbox/ | git am && \
|
||||
./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \
|
||||
make -j$(nproc) all install && \
|
||||
rm -rf /tmp/qemu
|
||||
@ -278,8 +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 "arc = /opt/arc_gnu_2021.03_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman
|
||||
RUN /bin/echo -e "kernelorg = /opt/gcc-13.1.0-nolibc/*" >> ~/.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
|
||||
RUN /bin/echo -e "\nsandbox = x86_64" >> ~/.buildman
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user