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: 27a0e16fea37
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: 523377efbe4c
Choose a head ref
  • 2 commits
  • 112 files changed
  • 1 contributor

Commits on Sep 28, 2015

  1. Copy the full SHA
    e92d00f View commit details
  2. Copy the full SHA
    523377e View commit details
Showing with 283 additions and 1,316 deletions.
  1. +0 −12 .gitignore
  2. +4 −4 .gitmodules
  3. +0 −20 crc.py
  4. +0 −32 flash_extra.py
  5. +0 −220 make.py
  6. +0 −12 misoc/cores/identifier.py
  7. +114 −0 misoc/integration/builder.py
  8. +10 −5 misoc/integration/cpu_interface.py
  9. +4 −1 misoc/integration/soc_core.py
  10. +40 −0 misoc/software/bios/Makefile
  11. 0 { → misoc}/software/bios/boot-helper-lm32.S
  12. 0 { → misoc}/software/bios/boot-helper-or1k.S
  13. +1 −1 { → misoc}/software/bios/boot.c
  14. 0 { → misoc}/software/bios/boot.h
  15. 0 { → misoc}/software/bios/dataflow.c
  16. 0 { → misoc}/software/bios/dataflow.h
  17. 0 { → misoc}/software/bios/isr.c
  18. 0 { → misoc}/software/bios/linker.ld
  19. +3 −5 { → misoc}/software/bios/main.c
  20. 0 { → misoc}/software/bios/sdram.c
  21. 0 { → misoc}/software/bios/sdram.h
  22. 0 {common → misoc/software/bios}/sfl.h
  23. +4 −7 { → misoc}/software/common.mak
  24. 0 software/compiler-rt → misoc/software/compiler_rt
  25. 0 { → misoc}/software/include/base/assert.h
  26. 0 { → misoc}/software/include/base/console.h
  27. 0 { → misoc}/software/include/base/crc.h
  28. 0 { → misoc}/software/include/base/ctype.h
  29. 0 { → misoc}/software/include/base/endian.h
  30. 0 { → misoc}/software/include/base/errno.h
  31. 0 { → misoc}/software/include/base/float.h
  32. 0 { → misoc}/software/include/base/id.h
  33. 0 { → misoc}/software/include/base/inttypes.h
  34. 0 { → misoc}/software/include/base/irq.h
  35. 0 { → misoc}/software/include/base/limits.h
  36. 0 { → misoc}/software/include/base/pthread.h
  37. 0 { → misoc}/software/include/base/spiflash.h
  38. 0 { → misoc}/software/include/base/spr-defs.h
  39. 0 { → misoc}/software/include/base/stdarg.h
  40. 0 { → misoc}/software/include/base/stdbool.h
  41. 0 { → misoc}/software/include/base/stddef.h
  42. 0 { → misoc}/software/include/base/stdint.h
  43. 0 { → misoc}/software/include/base/stdio.h
  44. 0 { → misoc}/software/include/base/stdlib.h
  45. 0 { → misoc}/software/include/base/string.h
  46. 0 { → misoc}/software/include/base/system.h
  47. 0 { → misoc}/software/include/base/time.h
  48. 0 { → misoc}/software/include/base/uart.h
  49. 0 { → misoc}/software/include/basec++/algorithm
  50. 0 { → misoc}/software/include/basec++/cstddef
  51. 0 { → misoc}/software/include/basec++/cstdlib
  52. 0 { → misoc}/software/include/basec++/new
  53. 0 { → misoc}/software/include/dyld/dlfcn.h
  54. 0 { → misoc}/software/include/dyld/dyld.h
  55. 0 { → misoc}/software/include/dyld/elf.h
  56. 0 { → misoc}/software/include/dyld/link.h
  57. 0 { → misoc}/software/include/hw/common.h
  58. 0 { → misoc}/software/include/hw/ethmac_mem.h
  59. 0 { → misoc}/software/include/hw/flags.h
  60. 0 { → misoc}/software/include/net/microudp.h
  61. 0 { → misoc}/software/include/net/tftp.h
  62. +5 −5 { → misoc}/software/libbase/Makefile
  63. 0 { → misoc}/software/libbase/console.c
  64. 0 { → misoc}/software/libbase/crc16.c
  65. 0 { → misoc}/software/libbase/crc32.c
  66. 0 { → misoc}/software/libbase/crt0-lm32.S
  67. 0 { → misoc}/software/libbase/crt0-or1k.S
  68. 0 { → misoc}/software/libbase/errno.c
  69. 0 { → misoc}/software/libbase/exception.c
  70. +1 −1 { → misoc}/software/libbase/id.c
  71. 0 { → misoc}/software/libbase/libc.c
  72. 0 { → misoc}/software/libbase/linker-sdram.ld
  73. 0 { → misoc}/software/libbase/qsort.c
  74. 0 { → misoc}/software/libbase/spiflash.c
  75. 0 { → misoc}/software/libbase/strtod.c
  76. 0 { → misoc}/software/libbase/system.c
  77. 0 { → misoc}/software/libbase/time.c
  78. 0 { → misoc}/software/libbase/uart.c
  79. 0 { → misoc}/software/libbase/vsnprintf.c
  80. +7 −7 {software/libcompiler-rt → misoc/software/libcompiler_rt}/Makefile
  81. +6 −3 { → misoc}/software/libdyld/Makefile
  82. 0 { → misoc}/software/libdyld/dyld.c
  83. +3 −3 { → misoc}/software/libnet/Makefile
  84. 0 { → misoc}/software/libnet/microudp.c
  85. 0 { → misoc}/software/libnet/tftp.c
  86. +31 −0 misoc/software/libunwind/Makefile
  87. 0 { → misoc}/software/libunwind/__cxxabi_config.h
  88. 0 { → misoc}/software/memtest/Makefile
  89. 0 { → misoc}/software/memtest/isr.c
  90. 0 { → misoc}/software/memtest/main.c
  91. 0 { → misoc}/software/unwinder
  92. 0 { → misoc}/targets/__init__.py
  93. 0 { → misoc}/targets/de0nano.py
  94. 0 { → misoc}/targets/kc705.py
  95. 0 { → misoc}/targets/minispartan6.py
  96. 0 { → misoc}/targets/mlabs_video.py
  97. +13 −3 targets/ppro.py → misoc/targets/papilio_pro.py
  98. 0 { → misoc}/targets/pipistrello.py
  99. 0 { → misoc}/targets/simple.py
  100. 0 { → misoc}/targets/versa.py
  101. 0 build/.keep_me → misoc/tools/__init__.py
  102. +1 −0 { → misoc}/tools/flterm.py
  103. +36 −0 misoc/tools/mkmscimg.py
  104. +0 −17 misoc_import.py
  105. +0 −12 mkmscimg.py
  106. 0 setup.py
  107. +0 −45 software/bios/Makefile
  108. 0 software/include/generated/.keep_me
  109. +0 −30 software/libunwind/Makefile
  110. +0 −18 tools/Makefile
  111. +0 −60 tools/byteswap.c
  112. +0 −793 tools/flterm.c
12 changes: 0 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
__pycache__
build/*
*.o
*.d
*.a
*.elf
*.bin
*.fbi
tools/flterm
tools/byteswap
software/include/generated/*.h
software/include/generated/*.ld
software/include/generated/*.mak
*.vcd
outgoing
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@
[submodule "misoc/cores/mor1kx/verilog"]
path = misoc/cores/mor1kx/verilog
url = https://github.com/openrisc/mor1kx.git
[submodule "software/compiler-rt"]
path = software/compiler-rt
[submodule "misoc/software/compiler_rt"]
path = misoc/software/compiler_rt
url = http://llvm.org/git/compiler-rt.git
[submodule "software/unwinder"]
path = software/unwinder
[submodule "misoc/software/unwinder"]
path = misoc/software/unwinder
url = https://github.com/whitequark/libunwind
20 changes: 0 additions & 20 deletions crc.py

This file was deleted.

32 changes: 0 additions & 32 deletions flash_extra.py

This file was deleted.

220 changes: 0 additions & 220 deletions make.py

This file was deleted.

12 changes: 0 additions & 12 deletions misoc/cores/identifier.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
import subprocess

from migen import *

from misoc.interconnect.csr import *


def get_id():
output = subprocess.check_output(["git", "rev-parse", "HEAD"]).decode("ascii")
return int(output[:8], 16)


class Identifier(Module, AutoCSR):
def __init__(self, sysid, frequency, revision=None):
self._sysid = CSRStatus(16)
self._revision = CSRStatus(32)
self._frequency = CSRStatus(32)

###

if revision is None:
revision = get_id()

self.comb += [
self._sysid.status.eq(sysid),
self._revision.status.eq(revision),
self._frequency.status.eq(frequency)
]
Loading