From: Sergiusz Bazanski <q3k@q3k.org>
Date: Mon, 22 Jan 2018 18:19:40 +0000 (+0000)
Subject: Write init files that respect CPU's endianness.
X-Git-Tag: 24jan2021_ls180~1754^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf74c781f433e4f7da81dc0f8be0ca7f4dd84ad0;p=litex.git

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.
---

diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
index 3cfe1ab2..066c847a 100644
--- a/litex/soc/integration/builder.py
+++ b/litex/soc/integration/builder.py
@@ -130,13 +130,17 @@ class Builder:
     def _initialize_rom(self):
         bios_file = os.path.join(self.output_dir, "software", "bios",
                                  "bios.bin")
+        endianness =  cpu_interface.cpu_endianness[self.soc.cpu_type]
         with open(bios_file, "rb") as boot_file:
             boot_data = []
             while True:
                 w = boot_file.read(4)
                 if not w:
                     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)
 
     def build(self, toolchain_path=None, **kwargs):
@@ -157,9 +161,11 @@ class Builder:
 
         if self.gateware_toolchain_path is not None:
             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"),
-                             run=self.compile_gateware, toolchain_path=toolchain_path,
-                             **kwargs)
+                             toolchain_path=toolchain_path, **kwargs)
         return vns