Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 204072717949
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ccb5655c9c8
Choose a head ref
  • 11 commits
  • 78 files changed
  • 1 contributor

Commits on Apr 13, 2015

  1. Copy the full SHA
    d9e0970 View commit details
  2. global: pep8 (E302)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    f68423f View commit details
  3. global: pep8 (E201)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    9ad90b5 View commit details
  4. global: pep8 (E231)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    ca7019f View commit details
  5. global: pep8 (E203)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    796119f View commit details
  6. global: pep8 (E401)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    01ba965 View commit details
  7. global: pep8 (E222)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    042b160 View commit details
  8. global: pep8 (E225)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    f3c010c View commit details
  9. global: pep8 (W262)

    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    71d0f6a View commit details
  10. Copy the full SHA
    fc68d91 View commit details
  11. global: more pep8

    we will have to continue the work... volunteers are welcome :)
    enjoy-digital committed Apr 13, 2015
    Copy the full SHA
    2ccb565 View commit details
Showing with 6,972 additions and 6,757 deletions.
  1. +15 −14 crc.py
  2. +21 −19 flash_extra.py
  3. +160 −155 make.py
  4. +15 −13 misoc_import.py
  5. +19 −15 misoclib/com/gpio/__init__.py
  6. +149 −148 misoclib/com/spi/__init__.py
  7. +62 −60 misoclib/com/spi/test/spi_master_tb.py
  8. +24 −23 misoclib/com/uart/__init__.py
  9. +8 −7 misoclib/com/uart/phy/__init__.py
  10. +91 −88 misoclib/com/uart/phy/serial.py
  11. +24 −21 misoclib/com/uart/phy/sim.py
  12. +93 −92 misoclib/com/uart/test/test_serial_phy.py
  13. +57 −56 misoclib/cpu/lm32/__init__.py
  14. +66 −64 misoclib/cpu/mor1kx/__init__.py
  15. +13 −12 misoclib/cpu/peripherals/identifier/__init__.py
  16. +3 −2 misoclib/cpu/peripherals/identifier/git.py
  17. +26 −25 misoclib/cpu/peripherals/timer/__init__.py
  18. +88 −87 misoclib/mem/flash/norflash16/__init__.py
  19. +161 −158 misoclib/mem/flash/spiflash/__init__.py
  20. +2 −2 misoclib/mem/sdram/__init__.py
  21. +24 −17 misoclib/mem/sdram/core/__init__.py
  22. +149 −144 misoclib/mem/sdram/core/lasmibus.py
  23. +52 −50 misoclib/mem/sdram/core/lasmicon/__init__.py
  24. +127 −124 misoclib/mem/sdram/core/lasmicon/bankmachine.py
  25. +211 −206 misoclib/mem/sdram/core/lasmicon/multiplexer.py
  26. +39 −38 misoclib/mem/sdram/core/lasmicon/perf.py
  27. +59 −58 misoclib/mem/sdram/core/lasmicon/refresher.py
  28. +168 −166 misoclib/mem/sdram/core/lasmixbar.py
  29. +189 −186 misoclib/mem/sdram/core/minicon/__init__.py
  30. +82 −81 misoclib/mem/sdram/frontend/dma_lasmi.py
  31. +93 −87 misoclib/mem/sdram/frontend/memtest.py
  32. +159 −158 misoclib/mem/sdram/frontend/wishbone2lasmi.py
  33. +144 −136 misoclib/mem/sdram/module.py
  34. +58 −52 misoclib/mem/sdram/phy/dfi.py
  35. +52 −50 misoclib/mem/sdram/phy/dfii.py
  36. +58 −57 misoclib/mem/sdram/phy/gensdrphy.py
  37. +200 −199 misoclib/mem/sdram/phy/initsequence.py
  38. +257 −256 misoclib/mem/sdram/phy/k7ddrphy.py
  39. +340 −339 misoclib/mem/sdram/phy/s6ddrphy.py
  40. +169 −165 misoclib/mem/sdram/phy/simphy.py
  41. +28 −25 misoclib/mem/sdram/test/abstract_transactions_lasmi.py
  42. +30 −28 misoclib/mem/sdram/test/bankmachine_tb.py
  43. +80 −75 misoclib/mem/sdram/test/common.py
  44. +26 −25 misoclib/mem/sdram/test/lasmicon_df_tb.py
  45. +25 −21 misoclib/mem/sdram/test/lasmicon_tb.py
  46. +23 −21 misoclib/mem/sdram/test/lasmicon_wb.py
  47. +135 −132 misoclib/mem/sdram/test/minicon_tb.py
  48. +33 −31 misoclib/mem/sdram/test/refresher.py
  49. +36 −35 misoclib/others/mxcrg/__init__.py
  50. +187 −185 misoclib/soc/__init__.py
  51. +90 −83 misoclib/soc/cpuif.py
  52. +68 −64 misoclib/soc/sdram.py
  53. +55 −54 misoclib/video/dvisampler/__init__.py
  54. +194 −191 misoclib/video/dvisampler/analysis.py
  55. +111 −108 misoclib/video/dvisampler/chansync.py
  56. +46 −45 misoclib/video/dvisampler/charsync.py
  57. +66 −65 misoclib/video/dvisampler/clocking.py
  58. +182 −181 misoclib/video/dvisampler/datacapture.py
  59. +33 −32 misoclib/video/dvisampler/debug.py
  60. +17 −16 misoclib/video/dvisampler/decoding.py
  61. +130 −127 misoclib/video/dvisampler/dma.py
  62. +179 −178 misoclib/video/dvisampler/edid.py
  63. +52 −51 misoclib/video/dvisampler/wer.py
  64. +17 −16 misoclib/video/framebuffer/__init__.py
  65. +203 −198 misoclib/video/framebuffer/dvi.py
  66. +126 −120 misoclib/video/framebuffer/format.py
  67. +207 −204 misoclib/video/framebuffer/phy.py
  68. +6 −6 mkmscimg.py
  69. +25 −24 setup.py
  70. +82 −78 targets/de0nano.py
  71. +110 −106 targets/kc705.py
  72. +60 −57 targets/minispartan6.py
  73. +103 −91 targets/mlabs_video.py
  74. +103 −97 targets/pipistrello.py
  75. +69 −65 targets/ppro.py
  76. +35 −30 targets/simple.py
  77. +9 −8 targets/versa.py
  78. +264 −254 tools/flterm.py
29 changes: 15 additions & 14 deletions crc.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import binascii


def insert_crc(i_filename, fbi_mode=False, o_filename=None):
if o_filename is None:
o_filename = i_filename
if o_filename is None:
o_filename = i_filename

with open(i_filename, 'rb') as f:
fdata = f.read()
fcrc = binascii.crc32(fdata).to_bytes(4, byteorder="big")
flength = len(fdata).to_bytes(4, byteorder="big")
with open(i_filename, 'rb') as f:
fdata = f.read()
fcrc = binascii.crc32(fdata).to_bytes(4, byteorder="big")
flength = len(fdata).to_bytes(4, byteorder="big")

with open(o_filename, 'wb') as f:
if fbi_mode:
f.write(flength)
f.write(fcrc)
f.write(fdata)
else:
f.write(fdata)
f.write(fcrc)
with open(o_filename, 'wb') as f:
if fbi_mode:
f.write(flength)
f.write(fcrc)
f.write(fdata)
else:
f.write(fdata)
f.write(fcrc)
40 changes: 21 additions & 19 deletions flash_extra.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
#!/usr/bin/env python3

import os, sys, argparse
import os
import sys
import argparse

from migen.util.misc import autotype

from misoc_import import misoc_import

if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Program extra data to flash memory.")
parser.add_argument("-f", "--flash-proxy-dir", default=None, help="set search directory for flash proxy bitstreams")
parser.add_argument("-X", "--external", default="", help="use external directory for platforms and imports")
parser.add_argument("-Op", "--platform-option", default=[], nargs=2, action="append", help="set platform-specific option")
parser.add_argument("platform", help="target platform")
parser.add_argument("file", help="file to flash")
parser.add_argument("address", help="flash address to write")
args = parser.parse_args()
parser = argparse.ArgumentParser(description="Program extra data to flash memory.")
parser.add_argument("-f", "--flash-proxy-dir", default=None, help="set search directory for flash proxy bitstreams")
parser.add_argument("-X", "--external", default="", help="use external directory for platforms and imports")
parser.add_argument("-Op", "--platform-option", default=[], nargs=2, action="append", help="set platform-specific option")
parser.add_argument("platform", help="target platform")
parser.add_argument("file", help="file to flash")
parser.add_argument("address", help="flash address to write")
args = parser.parse_args()

external_platform = ""
if args.external:
external_platform = os.path.join(args.external, "platforms")
sys.path.insert(1, os.path.abspath(args.external))
external_platform = ""
if args.external:
external_platform = os.path.join(args.external, "platforms")
sys.path.insert(1, os.path.abspath(args.external))

platform_module = misoc_import("mibuild.platforms", external_platform, args.platform)
platform_kwargs = dict((k, autotype(v)) for k, v in args.platform_option)
platform = platform_module.Platform(**platform_kwargs)
platform_module = misoc_import("mibuild.platforms", external_platform, args.platform)
platform_kwargs = dict((k, autotype(v)) for k, v in args.platform_option)
platform = platform_module.Platform(**platform_kwargs)

prog = platform.create_programmer()
prog.set_flash_proxy_dir(args.flash_proxy_dir)
prog.flash(int(args.address, 0), args.file)
prog = platform.create_programmer()
prog.set_flash_proxy_dir(args.flash_proxy_dir)
prog.flash(int(args.address, 0), args.file)
Loading