Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

builder: Move Meson check to _check_meson and only do it when using BIOS.

This commit is contained in:
Florent Kermarrec 2021-10-18 18:48:47 +02:00
parent 2a109c3a3e
commit 467c1b9b88
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
litex/soc/integration/builder.py
View File

@ -231,6 +231,19 @@ class Builder:
csr_svd_contents = export.get_csr_svd(self.soc) csr_svd_contents = export.get_csr_svd(self.soc)
write_to_file(os.path.realpath(self.csr_svd), csr_svd_contents) write_to_file(os.path.realpath(self.csr_svd), csr_svd_contents)
def _check_meson(self):
# Check Meson install/version.
meson_present = (shutil.which("meson") is not None)
meson_version = [0, 0, 0]
meson_major_min = 0
meson_minor_min = 59
if meson_present:
meson_version = subprocess.check_output(["meson", "-v"]).decode("utf-8").split(".")
if (not meson_present) or (int(meson_version[0]) < meson_major_min) or (int(meson_version[1]) < meson_minor_min):
msg = "Unable to find valid Meson build system, please install it with:\n"
msg += "- pip3 install meson.\n"
raise OSError(msg)
def _prepare_rom_software(self): def _prepare_rom_software(self):
# Create directories for all software packages. # Create directories for all software packages.
for name, src_dir in self.software_packages: for name, src_dir in self.software_packages:
@ -243,19 +256,6 @@ class Builder:
# Skip BIOS compilation when disabled. # Skip BIOS compilation when disabled.
if name == "bios" and not compile_bios: if name == "bios" and not compile_bios:
continue continue
# Check Meson install/version.
meson_present = (shutil.which("meson") is not None)
meson_version = [0, 0, 0]
meson_major_min = 0
meson_minor_min = 59
if meson_present:
meson_version = subprocess.check_output(["meson", "-v"]).decode("utf-8").split(".")
if (not meson_present) or (int(meson_version[0]) < meson_major_min) or (int(meson_version[1]) < meson_minor_min):
msg = "Unable to find valid Meson build system, please install it with:\n"
msg += "- pip3 install meson.\n"
raise OSError(msg)
# Compile software package. # Compile software package.
dst_dir = os.path.join(self.software_dir, name) dst_dir = os.path.join(self.software_dir, name)
makefile = os.path.join(src_dir, "Makefile") makefile = os.path.join(src_dir, "Makefile")
@ -314,6 +314,7 @@ class Builder:
) )
if use_bios: if use_bios:
self.soc.check_bios_requirements() self.soc.check_bios_requirements()
self._check_meson()
self._prepare_rom_software() self._prepare_rom_software()
self._generate_rom_software(compile_bios=use_bios) self._generate_rom_software(compile_bios=use_bios)