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

integration/builder: Add bios_format/--bios-format support to allow selecting printf format and pass it to picolibc. 

Useful to printf of float/double is required.
This commit is contained in:
Florent Kermarrec 2023-11-16 12:38:59 +01:00
parent 6d9cacd465
commit aa8e9dc32f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,7 @@ class Builder:
# BIOS. # BIOS.
bios_lto = False, bios_lto = False,
bios_format = "integer",
bios_console = "full", bios_console = "full",
# Documentation. # Documentation.
@ -113,6 +114,7 @@ class Builder:
# BIOS. # BIOS.
self.bios_lto = bios_lto self.bios_lto = bios_lto
self.bios_format = bios_format
self.bios_console = bios_console self.bios_console = bios_console
# Documentation. # Documentation.
@ -159,6 +161,7 @@ class Builder:
define("SOC_DIRECTORY", soc_directory) define("SOC_DIRECTORY", soc_directory)
define("PICOLIBC_DIRECTORY", picolibc_directory) define("PICOLIBC_DIRECTORY", picolibc_directory)
define("PICOLIBC_FORMAT", self.bios_format)
define("COMPILER_RT_DIRECTORY", compiler_rt_directory) define("COMPILER_RT_DIRECTORY", compiler_rt_directory)
variables_contents.append("export BUILDINC_DIRECTORY") variables_contents.append("export BUILDINC_DIRECTORY")
define("BUILDINC_DIRECTORY", self.include_dir) define("BUILDINC_DIRECTORY", self.include_dir)
@ -406,6 +409,7 @@ def builder_args(parser):
builder_group.add_argument("--doc", action="store_true", help="Generate SoC Documentation.") builder_group.add_argument("--doc", action="store_true", help="Generate SoC Documentation.")
bios_group = parser.add_argument_group(title="BIOS options") # FIXME: Move? bios_group = parser.add_argument_group(title="BIOS options") # FIXME: Move?
bios_group.add_argument("--bios-lto", action="store_true", help="Enable BIOS LTO (Link Time Optimization) compilation.") bios_group.add_argument("--bios-lto", action="store_true", help="Enable BIOS LTO (Link Time Optimization) compilation.")
bios_group.add_argument("--bios-format", default="integer", help="Select BIOS printf format.", choices=["integer", "float", "double"])
bios_group.add_argument("--bios-console", default="full" , help="Select BIOS console config.", choices=["full", "no-history", "no-autocomplete", "lite", "disable"]) bios_group.add_argument("--bios-console", default="full" , help="Select BIOS console config.", choices=["full", "no-history", "no-autocomplete", "lite", "disable"])
def builder_argdict(args): def builder_argdict(args):
@ -424,5 +428,6 @@ def builder_argdict(args):
"memory_x" : args.memory_x, "memory_x" : args.memory_x,
"generate_doc" : args.doc, "generate_doc" : args.doc,
"bios_lto" : args.bios_lto, "bios_lto" : args.bios_lto,
"bios_format" : args.bios_format,
"bios_console" : args.bios_console, "bios_console" : args.bios_console,
} }

2
litex/soc/software/libc/Makefile
View File

@ -49,7 +49,7 @@ __libc.a: cross.txt
-Datomic-ungetc=false \ -Datomic-ungetc=false \
-Dthread-local-storage=false \ -Dthread-local-storage=false \
-Dio-long-long=true \ -Dio-long-long=true \
-Dformat-default=integer \ -Dformat-default=$(PICOLIBC_FORMAT) \
-Dincludedir=picolibc/$(TRIPLE)/include \ -Dincludedir=picolibc/$(TRIPLE)/include \
-Dlibdir=picolibc/$(TRIPLE)/lib \ -Dlibdir=picolibc/$(TRIPLE)/lib \
--cross-file cross.txt --cross-file cross.txt