From 0b881d934ff8a7d88e3c2de35c5974b8d225176a Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 9 Nov 2013 15:27:32 +0100 Subject: [PATCH] rename milkymist-ng to MiSoC --- .gitignore | 3 +- LICENSE | 2 +- README | 30 ++++++++----------- make.py | 6 ++-- {milkymist => misoclib}/__init__.py | 0 .../counteradc/__init__.py | 0 {milkymist => misoclib}/cpuif.py | 0 {milkymist => misoclib}/dfii/__init__.py | 0 .../dvisampler/__init__.py | 18 +++++------ .../dvisampler/analysis.py | 2 +- .../dvisampler/chansync.py | 2 +- .../dvisampler/charsync.py | 2 +- .../dvisampler/clocking.py | 0 {milkymist => misoclib}/dvisampler/common.py | 0 .../dvisampler/datacapture.py | 0 {milkymist => misoclib}/dvisampler/debug.py | 6 ++-- .../dvisampler/decoding.py | 2 +- {milkymist => misoclib}/dvisampler/dma.py | 2 +- {milkymist => misoclib}/dvisampler/edid.py | 0 {milkymist => misoclib}/dvisampler/wer.py | 2 +- .../framebuffer/__init__.py | 4 +-- {milkymist => misoclib}/framebuffer/dvi.py | 0 {milkymist => misoclib}/framebuffer/format.py | 0 {milkymist => misoclib}/framebuffer/phy.py | 4 +-- {milkymist => misoclib}/gpio/__init__.py | 0 .../identifier/__init__.py | 0 {milkymist => misoclib}/lasmicon/__init__.py | 6 ++-- .../lasmicon/bankmachine.py | 2 +- .../lasmicon/multiplexer.py | 2 +- {milkymist => misoclib}/lasmicon/perf.py | 0 {milkymist => misoclib}/lasmicon/refresher.py | 2 +- {milkymist => misoclib}/lm32/__init__.py | 0 {milkymist => misoclib}/memtest/__init__.py | 0 {milkymist => misoclib}/minimac3/__init__.py | 0 {milkymist => misoclib}/mxcrg/__init__.py | 0 {milkymist => misoclib}/norflash/__init__.py | 0 {milkymist => misoclib}/s6ddrphy/__init__.py | 2 +- .../s6ddrphy/initsequence.py | 0 {milkymist => misoclib}/timer/__init__.py | 0 {milkymist => misoclib}/uart/__init__.py | 0 software/bios/Makefile | 22 +++++++------- software/bios/main.c | 4 +-- software/common.mak | 2 +- software/include/base/stdlib.h | 2 +- software/include/base/string.h | 2 +- software/libbase/Makefile | 4 +-- software/libbase/id.c | 2 +- software/libbase/libc.c | 2 +- software/libbase/vsnprintf.c | 2 +- software/libcompiler-rt/Makefile | 4 +-- software/libnet/Makefile | 4 +-- software/memtest/Makefile | 20 ++++++------- software/videomixer/Makefile | 22 +++++++------- tb/dvisampler/chansync.py | 2 +- tb/framebuffer/framebuffer.py | 2 +- tb/lasmicon/bankmachine.py | 2 +- tb/lasmicon/common.py | 2 +- tb/lasmicon/lasmicon.py | 2 +- tb/lasmicon/lasmicon_df.py | 2 +- tb/lasmicon/lasmicon_wb.py | 2 +- tb/lasmicon/refresher.py | 2 +- tools/Makefile | 4 +-- tools/byteswap.c | 2 +- tools/flterm.c | 4 +-- tools/{mkmmimg.c => mkmscimg.c} | 6 ++-- top.py | 2 +- 66 files changed, 109 insertions(+), 116 deletions(-) rename {milkymist => misoclib}/__init__.py (100%) rename {milkymist => misoclib}/counteradc/__init__.py (100%) rename {milkymist => misoclib}/cpuif.py (100%) rename {milkymist => misoclib}/dfii/__init__.py (100%) rename {milkymist => misoclib}/dvisampler/__init__.py (82%) rename {milkymist => misoclib}/dvisampler/analysis.py (98%) rename {milkymist => misoclib}/dvisampler/chansync.py (97%) rename {milkymist => misoclib}/dvisampler/charsync.py (96%) rename {milkymist => misoclib}/dvisampler/clocking.py (100%) rename {milkymist => misoclib}/dvisampler/common.py (100%) rename {milkymist => misoclib}/dvisampler/datacapture.py (100%) rename {milkymist => misoclib}/dvisampler/debug.py (90%) rename {milkymist => misoclib}/dvisampler/decoding.py (90%) rename {milkymist => misoclib}/dvisampler/dma.py (98%) rename {milkymist => misoclib}/dvisampler/edid.py (100%) rename {milkymist => misoclib}/dvisampler/wer.py (97%) rename {milkymist => misoclib}/framebuffer/__init__.py (96%) rename {milkymist => misoclib}/framebuffer/dvi.py (100%) rename {milkymist => misoclib}/framebuffer/format.py (100%) rename {milkymist => misoclib}/framebuffer/phy.py (98%) rename {milkymist => misoclib}/gpio/__init__.py (100%) rename {milkymist => misoclib}/identifier/__init__.py (100%) rename {milkymist => misoclib}/lasmicon/__init__.py (93%) rename {milkymist => misoclib}/lasmicon/bankmachine.py (98%) rename {milkymist => misoclib}/lasmicon/multiplexer.py (99%) rename {milkymist => misoclib}/lasmicon/perf.py (100%) rename {milkymist => misoclib}/lasmicon/refresher.py (96%) rename {milkymist => misoclib}/lm32/__init__.py (100%) rename {milkymist => misoclib}/memtest/__init__.py (100%) rename {milkymist => misoclib}/minimac3/__init__.py (100%) rename {milkymist => misoclib}/mxcrg/__init__.py (100%) rename {milkymist => misoclib}/norflash/__init__.py (100%) rename {milkymist => misoclib}/s6ddrphy/__init__.py (99%) rename {milkymist => misoclib}/s6ddrphy/initsequence.py (100%) rename {milkymist => misoclib}/timer/__init__.py (100%) rename {milkymist => misoclib}/uart/__init__.py (100%) rename tools/{mkmmimg.c => mkmscimg.c} (97%) diff --git a/.gitignore b/.gitignore index 61fe22b23..cea03fad1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,8 @@ build/* *.elf *.bin *.fbi -tools/bin2hex tools/flterm -tools/mkmmimg +tools/mkmscimg tools/byteswap software/include/hw/csr.h software/include/hw/sdram_phy.h diff --git a/LICENSE b/LICENSE index 541a9dcdd..70a79f87d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Unless otherwise noted, milkymist-ng is copyright (C) 2011-2013 Sebastien Bourdeauducq. +Unless otherwise noted, MiSoC is copyright (C) 2011-2013 Sebastien Bourdeauducq. All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/README b/README index 70d4d25e4..7c49085ad 100644 --- a/README +++ b/README @@ -1,17 +1,10 @@ -[> Milkymist-ng system-on-chip +[> MiSoC system-on-chip ------------------------------ -This is the next-generation Milkymist(tm) system-on-chip design, -introducing two key features: - * Built on the powerful Migen VLSI logic design system. - * Increased system memory performance thanks to LASMI. +A high performance system-on-chip design based on Migen. -This translates to more development productivity, better video resolution -and quality, ease of designing complex hardware accelerators, and much -more flexibility in hardware designs. - -The milkymist-ng SoC supports the Mixxeo and the Milkymist One. -Obtain yours at http://milkymist.org +MiSoC supports the Mixxeo and the Milkymist One. +Obtain your development system at http://milkymist.org [> Instructions (software) -------------------------- @@ -53,28 +46,29 @@ Once this is done, build the bitstream with: This will generate the build/soc-.bit programming file and load it with UrJTAG. -A new BIOS needs to be built and flashed for the -ng SoC. +A new BIOS needs to be built and flashed for MiSoC. +There is no compatibility with Milkymist SoC. Enjoy! [> Misc ------- Code repository: - https://github.com/milkymist/milkymist-ng + https://github.com/milkymist/misoc Send questions, comments and patches to devel [AT] lists.milkymist.org We are also on IRC: #milkymist on the Freenode network. -Milkymist-ng is released under the very permissive two-clause BSD license. Under -the terms of this license, you are authorized to use milkymist-ng for +MiSoC is released under the very permissive two-clause BSD license. Under +the terms of this license, you are authorized to use MiSoC for closed-source proprietary designs. Even though we do not require you to do so, those things are awesome, so please do them if possible: - * tell us that you are using milkymist-ng - * cite milkymist-ng in publications related to research it has helped + * tell us that you are using MiSoC + * cite MiSoC in publications related to research it has helped * send us feedback and suggestions for improvements * send us bug reports when something goes wrong - * send us the modifications and improvements you have done to milkymist-ng. + * send us the modifications and improvements you have done to MiSoC. The use of "git format-patch" is recommended. If your submission is large and complex and/or you are not sure how to proceed, feel free to discuss it on the mailing list or IRC (#milkymist on Freenode) beforehand. diff --git a/make.py b/make.py index f70b6d6ce..fc8548ff4 100755 --- a/make.py +++ b/make.py @@ -4,8 +4,8 @@ import argparse, os, importlib, subprocess from mibuild.tools import write_to_file -from milkymist import cpuif -from milkymist.s6ddrphy import initsequence +from misoclib import cpuif +from misoclib.s6ddrphy import initsequence import top, jtag def build(platform_name, build_bitstream, build_header, csr_csv_filename, *soc_args, **soc_kwargs): @@ -57,7 +57,7 @@ TIMESPEC "TSise_sucks2" = FROM "GRPsys_clk" TO "GRPvga_clk" TIG; write_to_file(csr_csv_filename, csr_csv) def main(): - parser = argparse.ArgumentParser(description="milkymist-ng - a high performance SoC built on Migen technology.") + parser = argparse.ArgumentParser(description="MiSoC - a high performance SoC based on Migen.") parser.add_argument("-p", "--platform", default="mixxeo", help="platform to build for") parser.add_argument("-B", "--no-bitstream", default=False, action="store_true", help="do not build bitstream file") parser.add_argument("-H", "--no-header", default=False, action="store_true", help="do not build C header files with CSR/IRQ/SDRAM_PHY defs") diff --git a/milkymist/__init__.py b/misoclib/__init__.py similarity index 100% rename from milkymist/__init__.py rename to misoclib/__init__.py diff --git a/milkymist/counteradc/__init__.py b/misoclib/counteradc/__init__.py similarity index 100% rename from milkymist/counteradc/__init__.py rename to misoclib/counteradc/__init__.py diff --git a/milkymist/cpuif.py b/misoclib/cpuif.py similarity index 100% rename from milkymist/cpuif.py rename to misoclib/cpuif.py diff --git a/milkymist/dfii/__init__.py b/misoclib/dfii/__init__.py similarity index 100% rename from milkymist/dfii/__init__.py rename to misoclib/dfii/__init__.py diff --git a/milkymist/dvisampler/__init__.py b/misoclib/dvisampler/__init__.py similarity index 82% rename from milkymist/dvisampler/__init__.py rename to misoclib/dvisampler/__init__.py index c0227c129..fb1bbb88c 100644 --- a/milkymist/dvisampler/__init__.py +++ b/misoclib/dvisampler/__init__.py @@ -1,15 +1,15 @@ from migen.fhdl.std import * from migen.bank.description import AutoCSR -from milkymist.dvisampler.edid import EDID -from milkymist.dvisampler.clocking import Clocking -from milkymist.dvisampler.datacapture import DataCapture -from milkymist.dvisampler.charsync import CharSync -from milkymist.dvisampler.wer import WER -from milkymist.dvisampler.decoding import Decoding -from milkymist.dvisampler.chansync import ChanSync -from milkymist.dvisampler.analysis import SyncPolarity, ResolutionDetection, FrameExtraction -from milkymist.dvisampler.dma import DMA +from misoclib.dvisampler.edid import EDID +from misoclib.dvisampler.clocking import Clocking +from misoclib.dvisampler.datacapture import DataCapture +from misoclib.dvisampler.charsync import CharSync +from misoclib.dvisampler.wer import WER +from misoclib.dvisampler.decoding import Decoding +from misoclib.dvisampler.chansync import ChanSync +from misoclib.dvisampler.analysis import SyncPolarity, ResolutionDetection, FrameExtraction +from misoclib.dvisampler.dma import DMA class DVISampler(Module, AutoCSR): def __init__(self, pads, asmiport, n_dma_slots=2): diff --git a/milkymist/dvisampler/analysis.py b/misoclib/dvisampler/analysis.py similarity index 98% rename from milkymist/dvisampler/analysis.py rename to misoclib/dvisampler/analysis.py index c7d247862..17579f706 100644 --- a/milkymist/dvisampler/analysis.py +++ b/misoclib/dvisampler/analysis.py @@ -5,7 +5,7 @@ from migen.genlib.record import Record from migen.bank.description import * from migen.flow.actor import * -from milkymist.dvisampler.common import channel_layout, frame_layout +from misoclib.dvisampler.common import channel_layout, frame_layout class SyncPolarity(Module): def __init__(self): diff --git a/milkymist/dvisampler/chansync.py b/misoclib/dvisampler/chansync.py similarity index 97% rename from milkymist/dvisampler/chansync.py rename to misoclib/dvisampler/chansync.py index 272408e1d..270ef40e8 100644 --- a/milkymist/dvisampler/chansync.py +++ b/misoclib/dvisampler/chansync.py @@ -5,7 +5,7 @@ from migen.genlib.record import Record, layout_len from migen.genlib.misc import optree from migen.bank.description import * -from milkymist.dvisampler.common import channel_layout +from misoclib.dvisampler.common import channel_layout class _SyncBuffer(Module): def __init__(self, width, depth): diff --git a/milkymist/dvisampler/charsync.py b/misoclib/dvisampler/charsync.py similarity index 96% rename from milkymist/dvisampler/charsync.py rename to misoclib/dvisampler/charsync.py index 92e38e9f5..99ea9aaaa 100644 --- a/milkymist/dvisampler/charsync.py +++ b/misoclib/dvisampler/charsync.py @@ -3,7 +3,7 @@ from migen.genlib.cdc import MultiReg from migen.genlib.misc import optree from migen.bank.description import * -from milkymist.dvisampler.common import control_tokens +from misoclib.dvisampler.common import control_tokens class CharSync(Module, AutoCSR): def __init__(self, required_controls=8): diff --git a/milkymist/dvisampler/clocking.py b/misoclib/dvisampler/clocking.py similarity index 100% rename from milkymist/dvisampler/clocking.py rename to misoclib/dvisampler/clocking.py diff --git a/milkymist/dvisampler/common.py b/misoclib/dvisampler/common.py similarity index 100% rename from milkymist/dvisampler/common.py rename to misoclib/dvisampler/common.py diff --git a/milkymist/dvisampler/datacapture.py b/misoclib/dvisampler/datacapture.py similarity index 100% rename from milkymist/dvisampler/datacapture.py rename to misoclib/dvisampler/datacapture.py diff --git a/milkymist/dvisampler/debug.py b/misoclib/dvisampler/debug.py similarity index 90% rename from milkymist/dvisampler/debug.py rename to misoclib/dvisampler/debug.py index 39326640a..555d3eeaf 100644 --- a/milkymist/dvisampler/debug.py +++ b/misoclib/dvisampler/debug.py @@ -4,9 +4,9 @@ from migen.genlib.record import layout_len from migen.bank.description import AutoCSR from migen.actorlib import structuring, dma_lasmi, spi -from milkymist.dvisampler.edid import EDID -from milkymist.dvisampler.clocking import Clocking -from milkymist.dvisampler.datacapture import DataCapture +from misoclib.dvisampler.edid import EDID +from misoclib.dvisampler.clocking import Clocking +from misoclib.dvisampler.datacapture import DataCapture class RawDVISampler(Module, AutoCSR): def __init__(self, pads, asmiport): diff --git a/milkymist/dvisampler/decoding.py b/misoclib/dvisampler/decoding.py similarity index 90% rename from milkymist/dvisampler/decoding.py rename to misoclib/dvisampler/decoding.py index 034f45435..73a6718a3 100644 --- a/milkymist/dvisampler/decoding.py +++ b/misoclib/dvisampler/decoding.py @@ -1,7 +1,7 @@ from migen.fhdl.std import * from migen.genlib.record import Record -from milkymist.dvisampler.common import control_tokens, channel_layout +from misoclib.dvisampler.common import control_tokens, channel_layout class Decoding(Module): def __init__(self): diff --git a/milkymist/dvisampler/dma.py b/misoclib/dvisampler/dma.py similarity index 98% rename from milkymist/dvisampler/dma.py rename to misoclib/dvisampler/dma.py index d1cfce553..f98f97eb8 100644 --- a/milkymist/dvisampler/dma.py +++ b/misoclib/dvisampler/dma.py @@ -5,7 +5,7 @@ from migen.bank.eventmanager import * from migen.flow.actor import * from migen.actorlib import dma_lasmi -from milkymist.dvisampler.common import frame_layout +from misoclib.dvisampler.common import frame_layout # Slot status: EMPTY=0 LOADED=1 PENDING=2 class _Slot(Module, AutoCSR): diff --git a/milkymist/dvisampler/edid.py b/misoclib/dvisampler/edid.py similarity index 100% rename from milkymist/dvisampler/edid.py rename to misoclib/dvisampler/edid.py diff --git a/milkymist/dvisampler/wer.py b/misoclib/dvisampler/wer.py similarity index 97% rename from milkymist/dvisampler/wer.py rename to misoclib/dvisampler/wer.py index 89d89a0ec..6be35abfd 100644 --- a/milkymist/dvisampler/wer.py +++ b/misoclib/dvisampler/wer.py @@ -3,7 +3,7 @@ from migen.bank.description import * from migen.genlib.misc import optree from migen.genlib.cdc import PulseSynchronizer -from milkymist.dvisampler.common import control_tokens +from misoclib.dvisampler.common import control_tokens class WER(Module, AutoCSR): def __init__(self, period_bits=24): diff --git a/milkymist/framebuffer/__init__.py b/misoclib/framebuffer/__init__.py similarity index 96% rename from milkymist/framebuffer/__init__.py rename to misoclib/framebuffer/__init__.py index eb64208f0..ec49dba28 100644 --- a/milkymist/framebuffer/__init__.py +++ b/misoclib/framebuffer/__init__.py @@ -4,8 +4,8 @@ from migen.flow.network import * from migen.bank.description import CSRStorage, AutoCSR from migen.actorlib import dma_lasmi, structuring, sim, spi -from milkymist.framebuffer.format import bpp, pixel_layout, FrameInitiator, VTG -from milkymist.framebuffer.phy import Driver +from misoclib.framebuffer.format import bpp, pixel_layout, FrameInitiator, VTG +from misoclib.framebuffer.phy import Driver class Framebuffer(Module, AutoCSR): def __init__(self, pads_vga, pads_dvi, lasmim, simulation=False): diff --git a/milkymist/framebuffer/dvi.py b/misoclib/framebuffer/dvi.py similarity index 100% rename from milkymist/framebuffer/dvi.py rename to misoclib/framebuffer/dvi.py diff --git a/milkymist/framebuffer/format.py b/misoclib/framebuffer/format.py similarity index 100% rename from milkymist/framebuffer/format.py rename to misoclib/framebuffer/format.py diff --git a/milkymist/framebuffer/phy.py b/misoclib/framebuffer/phy.py similarity index 98% rename from milkymist/framebuffer/phy.py rename to misoclib/framebuffer/phy.py index 0fbc65d79..ff71e6908 100644 --- a/milkymist/framebuffer/phy.py +++ b/misoclib/framebuffer/phy.py @@ -4,8 +4,8 @@ from migen.genlib.cdc import MultiReg from migen.bank.description import * from migen.flow.actor import * -from milkymist.framebuffer.format import bpc_phy, phy_layout -from milkymist.framebuffer import dvi +from misoclib.framebuffer.format import bpc_phy, phy_layout +from misoclib.framebuffer import dvi class _FIFO(Module): def __init__(self): diff --git a/milkymist/gpio/__init__.py b/misoclib/gpio/__init__.py similarity index 100% rename from milkymist/gpio/__init__.py rename to misoclib/gpio/__init__.py diff --git a/milkymist/identifier/__init__.py b/misoclib/identifier/__init__.py similarity index 100% rename from milkymist/identifier/__init__.py rename to misoclib/identifier/__init__.py diff --git a/milkymist/lasmicon/__init__.py b/misoclib/lasmicon/__init__.py similarity index 93% rename from milkymist/lasmicon/__init__.py rename to misoclib/lasmicon/__init__.py index 2e32d683d..60819cc8c 100644 --- a/milkymist/lasmicon/__init__.py +++ b/misoclib/lasmicon/__init__.py @@ -3,9 +3,9 @@ from collections import namedtuple from migen.fhdl.std import * from migen.bus import dfi, lasmibus -from milkymist.lasmicon.refresher import * -from milkymist.lasmicon.bankmachine import * -from milkymist.lasmicon.multiplexer import * +from misoclib.lasmicon.refresher import * +from misoclib.lasmicon.bankmachine import * +from misoclib.lasmicon.multiplexer import * PhySettings = namedtuple("PhySettings", "memtype dfi_d nphases rdphase wrphase rdcmdphase wrcmdphase cl read_latency write_latency") diff --git a/milkymist/lasmicon/bankmachine.py b/misoclib/lasmicon/bankmachine.py similarity index 98% rename from milkymist/lasmicon/bankmachine.py rename to misoclib/lasmicon/bankmachine.py index 6db44d196..a9568118c 100644 --- a/milkymist/lasmicon/bankmachine.py +++ b/misoclib/lasmicon/bankmachine.py @@ -4,7 +4,7 @@ from migen.genlib.fsm import FSM, NextState from migen.genlib.misc import optree from migen.genlib.fifo import SyncFIFO -from milkymist.lasmicon.multiplexer import * +from misoclib.lasmicon.multiplexer import * class _AddressSlicer: def __init__(self, col_a, address_align): diff --git a/milkymist/lasmicon/multiplexer.py b/misoclib/lasmicon/multiplexer.py similarity index 99% rename from milkymist/lasmicon/multiplexer.py rename to misoclib/lasmicon/multiplexer.py index 2f023ac77..2ca99c1e4 100644 --- a/milkymist/lasmicon/multiplexer.py +++ b/misoclib/lasmicon/multiplexer.py @@ -4,7 +4,7 @@ from migen.genlib.misc import optree from migen.genlib.fsm import FSM, NextState from migen.bank.description import AutoCSR -from milkymist.lasmicon.perf import Bandwidth +from misoclib.lasmicon.perf import Bandwidth class CommandRequest: def __init__(self, a, ba): diff --git a/milkymist/lasmicon/perf.py b/misoclib/lasmicon/perf.py similarity index 100% rename from milkymist/lasmicon/perf.py rename to misoclib/lasmicon/perf.py diff --git a/milkymist/lasmicon/refresher.py b/misoclib/lasmicon/refresher.py similarity index 96% rename from milkymist/lasmicon/refresher.py rename to misoclib/lasmicon/refresher.py index d22271c0d..aa493aedc 100644 --- a/milkymist/lasmicon/refresher.py +++ b/misoclib/lasmicon/refresher.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.genlib.misc import timeline from migen.genlib.fsm import FSM -from milkymist.lasmicon.multiplexer import * +from misoclib.lasmicon.multiplexer import * class Refresher(Module): def __init__(self, a, ba, tRP, tREFI, tRFC): diff --git a/milkymist/lm32/__init__.py b/misoclib/lm32/__init__.py similarity index 100% rename from milkymist/lm32/__init__.py rename to misoclib/lm32/__init__.py diff --git a/milkymist/memtest/__init__.py b/misoclib/memtest/__init__.py similarity index 100% rename from milkymist/memtest/__init__.py rename to misoclib/memtest/__init__.py diff --git a/milkymist/minimac3/__init__.py b/misoclib/minimac3/__init__.py similarity index 100% rename from milkymist/minimac3/__init__.py rename to misoclib/minimac3/__init__.py diff --git a/milkymist/mxcrg/__init__.py b/misoclib/mxcrg/__init__.py similarity index 100% rename from milkymist/mxcrg/__init__.py rename to misoclib/mxcrg/__init__.py diff --git a/milkymist/norflash/__init__.py b/misoclib/norflash/__init__.py similarity index 100% rename from milkymist/norflash/__init__.py rename to misoclib/norflash/__init__.py diff --git a/milkymist/s6ddrphy/__init__.py b/misoclib/s6ddrphy/__init__.py similarity index 99% rename from milkymist/s6ddrphy/__init__.py rename to misoclib/s6ddrphy/__init__.py index 119f97793..cb0aa33ac 100644 --- a/milkymist/s6ddrphy/__init__.py +++ b/misoclib/s6ddrphy/__init__.py @@ -24,7 +24,7 @@ from migen.fhdl.std import * from migen.bus.dfi import * from migen.genlib.record import * -from milkymist import lasmicon +from misoclib import lasmicon class S6DDRPHY(Module): def __init__(self, pads, memtype, nphases, cl, rd_bitslip, wr_bitslip, dqs_ddr_alignment): diff --git a/milkymist/s6ddrphy/initsequence.py b/misoclib/s6ddrphy/initsequence.py similarity index 100% rename from milkymist/s6ddrphy/initsequence.py rename to misoclib/s6ddrphy/initsequence.py diff --git a/milkymist/timer/__init__.py b/misoclib/timer/__init__.py similarity index 100% rename from milkymist/timer/__init__.py rename to misoclib/timer/__init__.py diff --git a/milkymist/uart/__init__.py b/misoclib/uart/__init__.py similarity index 100% rename from milkymist/uart/__init__.py rename to misoclib/uart/__init__.py diff --git a/software/bios/Makefile b/software/bios/Makefile index 9a7ef9795..f6d45b87a 100644 --- a/software/bios/Makefile +++ b/software/bios/Makefile @@ -1,5 +1,5 @@ -M2DIR=../.. -include $(M2DIR)/software/common.mak +MSCDIR=../.. +include $(MSCDIR)/software/common.mak OBJECTS=isr.o sdram.o main.o boot-helper.o boot.o dataflow.o @@ -9,20 +9,20 @@ all: bios.bin -include $(OBJECTS:.o=.d) %.bin: %.elf - $(MAKE) -C $(M2DIR)/tools + $(MAKE) -C $(MSCDIR)/tools $(OBJCOPY) -O binary $< $@ chmod -x $@ - $(M2DIR)/tools/mkmmimg $@ write + $(MSCDIR)/tools/mkmscimg $@ write bios.elf: linker.ld $(OBJECTS) libs %.elf: $(LD) $(LDFLAGS) -T $< -N -o $@ \ - $(M2DIR)/software/libbase/crt0.o \ + $(MSCDIR)/software/libbase/crt0.o \ $(OBJECTS) \ - -L$(M2DIR)/software/libnet \ - -L$(M2DIR)/software/libbase \ - -L$(M2DIR)/software/libcompiler-rt \ + -L$(MSCDIR)/software/libnet \ + -L$(MSCDIR)/software/libbase \ + -L$(MSCDIR)/software/libcompiler-rt \ -lnet -lbase-nofloat -lcompiler-rt chmod -x $@ @@ -36,9 +36,9 @@ main.o: main.c $(assemble) libs: - $(MAKE) -C $(M2DIR)/software/libcompiler-rt - $(MAKE) -C $(M2DIR)/software/libbase - $(MAKE) -C $(M2DIR)/software/libnet + $(MAKE) -C $(MSCDIR)/software/libcompiler-rt + $(MAKE) -C $(MSCDIR)/software/libbase + $(MAKE) -C $(MSCDIR)/software/libnet flash: bios.bin m1nor-ng bios.bin diff --git a/software/bios/main.c b/software/bios/main.c index c3e9a9a49..50f4897e8 100644 --- a/software/bios/main.c +++ b/software/bios/main.c @@ -307,7 +307,7 @@ static void dfs(char *baseaddr) static void help(void) { - puts("Milkymist(tm) BIOS"); + puts("MiSoC BIOS"); puts("Don't know what to do? Try 'flashboot'.\n"); puts("Available commands:"); puts("mr - read address space"); @@ -402,7 +402,7 @@ static void crcbios(void) } static const char banner[] = - "\nMILKYMIST(tm) v"VERSION" BIOS http://www.milkymist.org\n" + "\nMiSoC(tm) v"VERSION" BIOS http://www.milkymist.org\n" "(c) Copyright 2007-2013 Sebastien Bourdeauducq\n" "Built "__DATE__" "__TIME__"\n\n" "This program is free software: you can redistribute it and/or modify\n" diff --git a/software/common.mak b/software/common.mak index adc7c9362..825a88e51 100644 --- a/software/common.mak +++ b/software/common.mak @@ -38,7 +38,7 @@ endif # Toolchain options # -INCLUDES = -I$(M2DIR)/software/include/base -I$(M2DIR)/software/include -I$(M2DIR)/common +INCLUDES = -I$(MSCDIR)/software/include/base -I$(MSCDIR)/software/include -I$(MSCDIR)/common COMMONFLAGS = -O3 -mbarrel-shift-enabled -mmultiply-enabled -mdivide-enabled -msign-extend-enabled \ -Wall -fno-builtin -nostdinc $(INCLUDES) CFLAGS = $(COMMONFLAGS) -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes diff --git a/software/include/base/stdlib.h b/software/include/base/stdlib.h index 790e4eb0c..da67b4e23 100644 --- a/software/include/base/stdlib.h +++ b/software/include/base/stdlib.h @@ -1,5 +1,5 @@ /* - * Milkymist SoC (Software) + * MiSoC * Copyright (C) 2007, 2008, 2009, 2011 Sebastien Bourdeauducq * Copyright (C) Linux kernel developers * diff --git a/software/include/base/string.h b/software/include/base/string.h index 9a4c22fed..4d0716be6 100644 --- a/software/include/base/string.h +++ b/software/include/base/string.h @@ -1,5 +1,5 @@ /* - * Milkymist SoC (Software) + * MiSoC * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq * Copyright (C) Linus Torvalds and Linux kernel developers * diff --git a/software/libbase/Makefile b/software/libbase/Makefile index b9b9a7ab2..f8a90b1af 100644 --- a/software/libbase/Makefile +++ b/software/libbase/Makefile @@ -1,5 +1,5 @@ -M2DIR=../.. -include $(M2DIR)/software/common.mak +MSCDIR=../.. +include $(MSCDIR)/software/common.mak OBJECTS=setjmp.o libc.o errno.o crc16.o crc32.o console.o system.o id.o uart.o time.o qsort.o strtod.o diff --git a/software/libbase/id.c b/software/libbase/id.c index bbb927dac..03382966e 100644 --- a/software/libbase/id.c +++ b/software/libbase/id.c @@ -43,5 +43,5 @@ void id_print(void) get_soc_version_formatted(soc_version); get_sysid_formatted(sysid); - printf("Running on Milkymist-ng SoC %s (sysid:%s) at %dMHz\n", soc_version, sysid, identifier_frequency_read()/1000000); + printf("Running on MiSoC %s (sysid:%s) at %dMHz\n", soc_version, sysid, identifier_frequency_read()/1000000); } diff --git a/software/libbase/libc.c b/software/libbase/libc.c index 876e195dc..e45a79dac 100644 --- a/software/libbase/libc.c +++ b/software/libbase/libc.c @@ -1,5 +1,5 @@ /* - * Milkymist SoC (Software) + * MiSoC * Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq * Copyright (C) Linus Torvalds and Linux kernel developers * diff --git a/software/libbase/vsnprintf.c b/software/libbase/vsnprintf.c index d23f66a7b..2192974dc 100644 --- a/software/libbase/vsnprintf.c +++ b/software/libbase/vsnprintf.c @@ -1,5 +1,5 @@ /* - * Milkymist SoC (Software) + * MiSoC * Copyright (C) 2007, 2008, 2009 Sebastien Bourdeauducq * Copyright (C) Linux kernel developers * diff --git a/software/libcompiler-rt/Makefile b/software/libcompiler-rt/Makefile index 4bc33fe4f..feeeb69cb 100644 --- a/software/libcompiler-rt/Makefile +++ b/software/libcompiler-rt/Makefile @@ -1,5 +1,5 @@ -M2DIR=../.. -include $(M2DIR)/software/common.mak +MSCDIR=../.. +include $(MSCDIR)/software/common.mak CFLAGS+=-D_YUGA_LITTLE_ENDIAN=0 -D_YUGA_BIG_ENDIAN=1 -Wno-missing-prototypes diff --git a/software/libnet/Makefile b/software/libnet/Makefile index e0f35a138..ad6a0473c 100644 --- a/software/libnet/Makefile +++ b/software/libnet/Makefile @@ -1,5 +1,5 @@ -M2DIR=../.. -include $(M2DIR)/software/common.mak +MSCDIR=../.. +include $(MSCDIR)/software/common.mak OBJECTS=microudp.o tftp.o diff --git a/software/memtest/Makefile b/software/memtest/Makefile index 5647d32a9..0a06503c6 100644 --- a/software/memtest/Makefile +++ b/software/memtest/Makefile @@ -1,5 +1,5 @@ -M2DIR=../.. -include $(M2DIR)/software/common.mak +MSCDIR=../.. +include $(MSCDIR)/software/common.mak OBJECTS=isr.o main.o @@ -16,12 +16,12 @@ memtest.elf: $(OBJECTS) libs %.elf: $(LD) $(LDFLAGS) \ - -T $(M2DIR)/software/libbase/linker-sdram.ld \ + -T $(MSCDIR)/software/libbase/linker-sdram.ld \ -N -o $@ \ - $(M2DIR)/software/libbase/crt0.o \ + $(MSCDIR)/software/libbase/crt0.o \ $(OBJECTS) \ - -L$(M2DIR)/software/libbase \ - -L$(M2DIR)/software/libcompiler-rt \ + -L$(MSCDIR)/software/libbase \ + -L$(MSCDIR)/software/libcompiler-rt \ -lbase -lcompiler-rt chmod -x $@ @@ -35,12 +35,12 @@ main.o: main.c $(assemble) libs: - $(MAKE) -C $(M2DIR)/software/libcompiler-rt - $(MAKE) -C $(M2DIR)/software/libbase + $(MAKE) -C $(MSCDIR)/software/libcompiler-rt + $(MAKE) -C $(MSCDIR)/software/libbase load: memtest.bin - $(MAKE) -C $(M2DIR)/tools - $(M2DIR)/tools/flterm --port /dev/ttyUSB0 --kernel memtest.bin + $(MAKE) -C $(MSCDIR)/tools + $(MSCDIR)/tools/flterm --port /dev/ttyUSB0 --kernel memtest.bin clean: diff --git a/software/videomixer/Makefile b/software/videomixer/Makefile index 9742ac9d7..9ec2f7184 100644 --- a/software/videomixer/Makefile +++ b/software/videomixer/Makefile @@ -1,5 +1,5 @@ -M2DIR=../.. -include $(M2DIR)/software/common.mak +MSCDIR=../.. +include $(MSCDIR)/software/common.mak OBJECTS=isr.o fb.o dvisampler0.o dvisampler1.o main.o @@ -13,18 +13,18 @@ all: videomixer.bin videomixer.fbi chmod -x $@ %.fbi: %.bin - $(M2DIR)/tools/mkmmimg $< write $@ + $(MSCDIR)/tools/mkmscimg $< write $@ videomixer.elf: $(OBJECTS) libs %.elf: $(LD) $(LDFLAGS) \ - -T $(M2DIR)/software/libbase/linker-sdram.ld \ + -T $(MSCDIR)/software/libbase/linker-sdram.ld \ -N -o $@ \ - $(M2DIR)/software/libbase/crt0.o \ + $(MSCDIR)/software/libbase/crt0.o \ $(OBJECTS) \ - -L$(M2DIR)/software/libbase \ - -L$(M2DIR)/software/libcompiler-rt \ + -L$(MSCDIR)/software/libbase \ + -L$(MSCDIR)/software/libcompiler-rt \ -lbase -lcompiler-rt chmod -x $@ @@ -62,12 +62,12 @@ dvisampler0.o: dvisampler0.h dvisampler1.o: dvisampler1.h libs: - $(MAKE) -C $(M2DIR)/software/libcompiler-rt - $(MAKE) -C $(M2DIR)/software/libbase + $(MAKE) -C $(MSCDIR)/software/libcompiler-rt + $(MAKE) -C $(MSCDIR)/software/libbase load: videomixer.bin - $(MAKE) -C $(M2DIR)/tools - $(M2DIR)/tools/flterm --port /dev/ttyUSB0 --kernel videomixer.bin + $(MAKE) -C $(MSCDIR)/tools + $(MSCDIR)/tools/flterm --port /dev/ttyUSB0 --kernel videomixer.bin flash: videomixer.fbi m1nor-ng videomixer.fbi diff --git a/tb/dvisampler/chansync.py b/tb/dvisampler/chansync.py index 9a8fbf779..4327d2d38 100644 --- a/tb/dvisampler/chansync.py +++ b/tb/dvisampler/chansync.py @@ -1,7 +1,7 @@ from migen.fhdl.std import * from migen.sim.generic import * -from milkymist.dvisampler.chansync import ChanSync +from misoclib.dvisampler.chansync import ChanSync class TB(Module): def __init__(self, test_seq_it): diff --git a/tb/framebuffer/framebuffer.py b/tb/framebuffer/framebuffer.py index bddde1be3..9d8d1da14 100644 --- a/tb/framebuffer/framebuffer.py +++ b/tb/framebuffer/framebuffer.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.bus import asmibus from migen.sim.generic import Simulator -from milkymist.framebuffer import * +from misoclib.framebuffer import * def main(): hub = asmibus.Hub(16, 128) diff --git a/tb/lasmicon/bankmachine.py b/tb/lasmicon/bankmachine.py index 3564183ac..3a45daee8 100644 --- a/tb/lasmicon/bankmachine.py +++ b/tb/lasmicon/bankmachine.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.bus.lasmibus import * from migen.sim.generic import Simulator, TopLevel -from milkymist.lasmicon.bankmachine import * +from misoclib.lasmicon.bankmachine import * from common import sdram_geom, sdram_timing, CommandLogger diff --git a/tb/lasmicon/common.py b/tb/lasmicon/common.py index d7acd5c1e..74bf579a5 100644 --- a/tb/lasmicon/common.py +++ b/tb/lasmicon/common.py @@ -4,7 +4,7 @@ from math import ceil from migen.fhdl.std import * from migen.sim.generic import Proxy -from milkymist import lasmicon +from misoclib import lasmicon MHz = 1000000 clk_freq = (83 + Fraction(1, 3))*MHz diff --git a/tb/lasmicon/lasmicon.py b/tb/lasmicon/lasmicon.py index e64ece39c..691569380 100644 --- a/tb/lasmicon/lasmicon.py +++ b/tb/lasmicon/lasmicon.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.bus.lasmibus import * from migen.sim.generic import Simulator, TopLevel -from milkymist.lasmicon import * +from misoclib.lasmicon import * from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/tb/lasmicon/lasmicon_df.py b/tb/lasmicon/lasmicon_df.py index 054e1b660..c34c8fad4 100644 --- a/tb/lasmicon/lasmicon_df.py +++ b/tb/lasmicon/lasmicon_df.py @@ -3,7 +3,7 @@ from migen.bus import lasmibus from migen.actorlib import dma_lasmi from migen.sim.generic import Simulator, TopLevel, Proxy -from milkymist.lasmicon import * +from misoclib.lasmicon import * from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/tb/lasmicon/lasmicon_wb.py b/tb/lasmicon/lasmicon_wb.py index 4d6e24764..ad2f429bc 100644 --- a/tb/lasmicon/lasmicon_wb.py +++ b/tb/lasmicon/lasmicon_wb.py @@ -3,7 +3,7 @@ from migen.bus import wishbone, wishbone2lasmi, lasmibus from migen.bus.transactions import * from migen.sim.generic import Simulator, TopLevel -from milkymist.lasmicon import * +from misoclib.lasmicon import * from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/tb/lasmicon/refresher.py b/tb/lasmicon/refresher.py index 72a527a3f..daa865307 100644 --- a/tb/lasmicon/refresher.py +++ b/tb/lasmicon/refresher.py @@ -3,7 +3,7 @@ from random import Random from migen.fhdl.std import * from migen.sim.generic import Simulator, TopLevel -from milkymist.lasmicon.refresher import * +from misoclib.lasmicon.refresher import * from common import CommandLogger diff --git a/tools/Makefile b/tools/Makefile index 216e33d7d..85212499f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -TARGETS=mkmmimg flterm byteswap +TARGETS=mkmscimg flterm byteswap CC=gcc RM ?= rm -f @@ -7,7 +7,7 @@ all: $(TARGETS) %: %.c $(CC) -O2 -Wall -I../common -s -o $@ $< -install: mkmmimg flterm +install: mkmscimg flterm install -d /usr/local/bin install -m755 -t /usr/local/bin $^ diff --git a/tools/byteswap.c b/tools/byteswap.c index 8d12b632a..3e16236b2 100644 --- a/tools/byteswap.c +++ b/tools/byteswap.c @@ -1,5 +1,5 @@ /* - * Milkymist SoC + * MiSoC * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq * * This program is free software: you can redistribute it and/or modify diff --git a/tools/flterm.c b/tools/flterm.c index 604ba5d75..2a1c71077 100644 --- a/tools/flterm.c +++ b/tools/flterm.c @@ -1,5 +1,5 @@ /* - * Milkymist SoC + * MiSoC * Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq * Copyright (C) 2011 Michael Walle * Copyright (C) 2004 MontaVista Software, Inc @@ -645,7 +645,7 @@ static const struct option options[] = { static void print_usage() { - fprintf(stderr, "Serial boot program for Milkymist SoC - v. 2.3\n"); + fprintf(stderr, "Serial boot program for MiSoC - v. 2.4\n"); fprintf(stderr, "Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq\n"); fprintf(stderr, "Copyright (C) 2011 Michael Walle\n"); fprintf(stderr, "Copyright (C) 2004 MontaVista Software, Inc\n\n"); diff --git a/tools/mkmmimg.c b/tools/mkmscimg.c similarity index 97% rename from tools/mkmmimg.c rename to tools/mkmscimg.c index e3ad7309b..49830feb1 100644 --- a/tools/mkmmimg.c +++ b/tools/mkmscimg.c @@ -1,8 +1,8 @@ /* - * CRC32 computation tool and Milkymist image file writer + * CRC32 computation tool and MiSoC image file writer * (c) 2009, 2010, 2012 Sebastien Bourdeauducq * Released under GNU GPL v3 - * This file is part of Milkymist. + * This file is part of MiSoC. */ /* crc32.c -- compute the CRC-32 of a data stream @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) if(((argc != 2) && (argc != 3) && (argc != 4)) || ((argc > 2) && (strcmp(argv[2], "write")))) { - fprintf(stderr, "Usage: mkmmimg [write] [dest]\n"); + fprintf(stderr, "Usage: mkmscimg [write] [dest]\n"); return 1; } diff --git a/top.py b/top.py index d25a95af4..67022bef3 100644 --- a/top.py +++ b/top.py @@ -8,7 +8,7 @@ from migen.bus import wishbone2lasmi, wishbone2csr from migen.bank import csrgen from mibuild.generic_platform import ConstraintError -from milkymist import mxcrg, lm32, norflash, uart, s6ddrphy, dfii, lasmicon, \ +from misoclib import mxcrg, lm32, norflash, uart, s6ddrphy, dfii, lasmicon, \ identifier, timer, minimac3, framebuffer, dvisampler, gpio, memtest version = "2.0"