summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/docker/Dockerfile13
-rw-r--r--tools/dtoc/src_scan.py8
2 files changed, 16 insertions, 5 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 <trini@konsulko.com>
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