diff options
| author | Tom Rini <[email protected]> | 2024-03-11 13:40:06 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-03-11 15:27:20 -0400 |
| commit | 20a0ce574d6642e0dfe651467159039fac48cc4f (patch) | |
| tree | 9a76dcd90a2e27e65963b4a74d1621cd10fe91f0 /tools | |
| parent | beedf675b36841ce1e077779157a87a6505317e6 (diff) | |
| parent | f3c979dd0053c082d2df170446923e7ce5edbc2d (diff) | |
Merge tag 'v2024.04-rc4' into next
Prepare v2024.04-rc4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker/Dockerfile | 13 | ||||
| -rw-r--r-- | tools/dtoc/src_scan.py | 8 | ||||
| -rwxr-xr-x | tools/imx9_image.sh | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 6122776bc64..27425545661 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-20240111 +FROM ubuntu:jammy-20240125 MAINTAINER Tom Rini <[email protected]> LABEL Description=" This image is for building U-Boot inside a container" @@ -231,6 +231,17 @@ RUN mkdir /tmp/trace && \ sudo make install && \ rm -rf /tmp/trace +# Build coreboot +RUN wget -O - https://coreboot.org/releases/coreboot-4.22.01.tar.xz | tar -C /tmp -xJ && \ + cd /tmp/coreboot-4.22.01 && \ + make crossgcc-i386 CPUS=$(nproc) && \ + make -C payloads/coreinfo olddefconfig && \ + make -C payloads/coreinfo && \ + make olddefconfig && \ + make -j $(nproc) && \ + sudo mkdir /opt/coreboot && \ + sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ + # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot RUN useradd -m -U uboot diff --git a/tools/dtoc/src_scan.py b/tools/dtoc/src_scan.py index 3bef59d616e..2437200a42d 100644 --- a/tools/dtoc/src_scan.py +++ b/tools/dtoc/src_scan.py @@ -291,8 +291,8 @@ class Scanner: """ structs = {} - re_struct = re.compile('^struct ([a-z0-9_]+) {$') - re_asm = re.compile('../arch/[a-z0-9]+/include/asm/(.*)') + re_struct = re.compile(r'^struct ([a-z0-9_]+) {$') + re_asm = re.compile(r'../arch/[a-z0-9]+/include/asm/(.*)') prefix = '' for line in buff.splitlines(): # Handle line continuation @@ -470,8 +470,8 @@ class Scanner: re_of_match = re.compile( r'\.of_match\s*=\s*(of_match_ptr\()?([a-z0-9_]+)([^,]*),') - re_phase = re.compile('^\s*DM_PHASE\((.*)\).*$') - re_hdr = re.compile('^\s*DM_HEADER\((.*)\).*$') + re_phase = re.compile(r'^\s*DM_PHASE\((.*)\).*$') + re_hdr = re.compile(r'^\s*DM_HEADER\((.*)\).*$') re_alias = re.compile(r'DM_DRIVER_ALIAS\(\s*(\w+)\s*,\s*(\w+)\s*\)') # Matches the struct name for priv, plat diff --git a/tools/imx9_image.sh b/tools/imx9_image.sh index 88dfcfe606c..ca78a57a19a 100755 --- a/tools/imx9_image.sh +++ b/tools/imx9_image.sh @@ -19,7 +19,7 @@ for f in $blobs; do fi if [ ! -f $tmp ]; then - echo "WARNING '$tmp' not found, resulting binary is not-functional" >&2 + echo "WARNING '$tmp' not found, resulting binary may be not-functional" >&2 # Comment-out the lines for un-existing files. This way, # mkimage can keep working. This allows CI tests to pass even |