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

Write init files that respect CPU's endianness. 

This is required for PicoRV32 support. We also drive-by enable
explicit specification of run= in Builder.build() by callers.
This commit is contained in:
Sergiusz Bazanski 2018-01-22 18:19:40 +00:00
parent 7176492231
commit cf74c781f4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,13 +130,17 @@ class Builder:
def _initialize_rom(self): def _initialize_rom(self):
bios_file = os.path.join(self.output_dir, "software", "bios", bios_file = os.path.join(self.output_dir, "software", "bios",
"bios.bin") "bios.bin")
endianness = cpu_interface.cpu_endianness[self.soc.cpu_type]
with open(bios_file, "rb") as boot_file: with open(bios_file, "rb") as boot_file:
boot_data = [] boot_data = []
while True: while True:
w = boot_file.read(4) w = boot_file.read(4)
if not w: if not w:
break break
boot_data.append(struct.unpack(">I", w)[0]) if endianness == 'little':
boot_data.append(struct.unpack("<I", w)[0])
else:
boot_data.append(struct.unpack(">I", w)[0])
self.soc.initialize_rom(boot_data) self.soc.initialize_rom(boot_data)
def build(self, toolchain_path=None, **kwargs): def build(self, toolchain_path=None, **kwargs):
@ -157,9 +161,11 @@ class Builder:
if self.gateware_toolchain_path is not None: if self.gateware_toolchain_path is not None:
toolchain_path = self.gateware_toolchain_path toolchain_path = self.gateware_toolchain_path
if 'run' not in kwargs:
kwargs['run'] = self.compile_gateware
vns = self.soc.build(build_dir=os.path.join(self.output_dir, "gateware"), vns = self.soc.build(build_dir=os.path.join(self.output_dir, "gateware"),
run=self.compile_gateware, toolchain_path=toolchain_path, toolchain_path=toolchain_path, **kwargs)
**kwargs)
return vns return vns