coelner/foboot
1
0
Fork 0
mirror of https://github.com/im-tomu/foboot.git synced 2024-09-20 02:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

foboot-bitstream: move "reset" block below USB pads

Browse Source 
This keeps the modules in an order that roughly matches the memory
order.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2019-11-23 13:57:49 +08:00
parent b40530df41
commit f751f51722
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/foboot-bitstream.py
View File

@ -208,12 +208,6 @@ class BaseSoC(SoCCore, AutoDoc):
self.register_mem("spiflash", self.mem_map["spiflash"], self.register_mem("spiflash", self.mem_map["spiflash"],
self.lxspi.bus, size=2 * 1024 * 1024) # NOTE: EVT is 16 * 1024 * 1024 self.lxspi.bus, size=2 * 1024 * 1024) # NOTE: EVT is 16 * 1024 * 1024
self.submodules.reboot = SBWarmBoot(self, warmboot_offsets)
if hasattr(self, "cpu"):
self.cpu.cpu_params.update(
i_externalResetVector=self.reboot.addr.storage,
)
# Add USB pads, as well as the appropriate USB controller. If no CPU is # Add USB pads, as well as the appropriate USB controller. If no CPU is
# present, use the DummyUsb controller. # present, use the DummyUsb controller.
usb_pads = platform.request("usb") usb_pads = platform.request("usb")
@ -235,6 +229,15 @@ class BaseSoC(SoCCore, AutoDoc):
platform.add_extension(TouchPads.touch_device) platform.add_extension(TouchPads.touch_device)
self.submodules.touch = TouchPads(platform.request("touch_pads")) self.submodules.touch = TouchPads(platform.request("touch_pads"))
# Allow the user to reboot the ICE40. Additionally, connect the CPU
# RESET line to a register that can be modified, to allow for
# us to debug programs even during reset.
self.submodules.reboot = SBWarmBoot(self, warmboot_offsets)
if hasattr(self, "cpu"):
self.cpu.cpu_params.update(
i_externalResetVector=self.reboot.addr.storage,
)
self.submodules.rgb = SBLED(platform.revision, platform.request("rgb_led")) self.submodules.rgb = SBLED(platform.revision, platform.request("rgb_led"))
self.submodules.version = Version(platform.revision, pnr_seed, models=[ self.submodules.version = Version(platform.revision, pnr_seed, models=[
("0x45", "E", "Fomu EVT"), ("0x45", "E", "Fomu EVT"),