From be3b603b17ca62def71588153e56778a14055f68 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 23 Nov 2013 10:45:15 +0100 Subject: [PATCH] merge Mibuild into Migen --- README | 12 ++++++ mibuild/LICENSE | 29 --------------- mibuild/README | 27 -------------- mibuild/{mibuild => }/__init__.py | 0 mibuild/{mibuild => }/altera_quartus.py | 0 mibuild/{mibuild => }/crg.py | 0 mibuild/{mibuild => }/generic_platform.py | 0 mibuild/{mibuild => }/platforms/__init__.py | 0 mibuild/{mibuild => }/platforms/de0nano.py | 0 mibuild/{mibuild => }/platforms/kc705.py | 0 .../{mibuild => }/platforms/lx9_microboard.py | 0 mibuild/{mibuild => }/platforms/m1.py | 0 mibuild/{mibuild => }/platforms/mixxeo.py | 0 mibuild/{mibuild => }/platforms/ml605.py | 0 .../{mibuild => }/platforms/papilio_pro.py | 0 mibuild/{mibuild => }/platforms/rhino.py | 0 mibuild/{mibuild => }/platforms/roach.py | 0 mibuild/setup.py | 37 ------------------- mibuild/{mibuild => }/tools.py | 0 mibuild/{mibuild => }/xilinx_ise.py | 0 20 files changed, 12 insertions(+), 93 deletions(-) delete mode 100644 mibuild/LICENSE delete mode 100644 mibuild/README rename mibuild/{mibuild => }/__init__.py (100%) rename mibuild/{mibuild => }/altera_quartus.py (100%) rename mibuild/{mibuild => }/crg.py (100%) rename mibuild/{mibuild => }/generic_platform.py (100%) rename mibuild/{mibuild => }/platforms/__init__.py (100%) rename mibuild/{mibuild => }/platforms/de0nano.py (100%) rename mibuild/{mibuild => }/platforms/kc705.py (100%) rename mibuild/{mibuild => }/platforms/lx9_microboard.py (100%) rename mibuild/{mibuild => }/platforms/m1.py (100%) rename mibuild/{mibuild => }/platforms/mixxeo.py (100%) rename mibuild/{mibuild => }/platforms/ml605.py (100%) rename mibuild/{mibuild => }/platforms/papilio_pro.py (100%) rename mibuild/{mibuild => }/platforms/rhino.py (100%) rename mibuild/{mibuild => }/platforms/roach.py (100%) delete mode 100755 mibuild/setup.py rename mibuild/{mibuild => }/tools.py (100%) rename mibuild/{mibuild => }/xilinx_ise.py (100%) diff --git a/README b/README index 9e4eb12d4..5602c358a 100644 --- a/README +++ b/README @@ -27,6 +27,18 @@ written in Python. See the doc/ folder for more technical information. +Quick intro: + +from migen.fhdl.std import * +from mibuild.platforms import m1 +plat = m1.Platform() +led = plat.request("user_led") +m = Module() +counter = Signal(26) +m.comb += led.eq(counter[25]) +m.sync += counter.eq(counter + 1) +plat.build_cmdline(m) + Code repository: https://github.com/milkymist/migen System-on-chip design based on Migen: diff --git a/mibuild/LICENSE b/mibuild/LICENSE deleted file mode 100644 index cdc6303bf..000000000 --- a/mibuild/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -Unless otherwise noted, Mibuild is copyright (C) 2013 Sebastien Bourdeauducq. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -Other authors retain ownership of their contributions. If a submission can -reasonably be considered independently copyrightable, it's yours and we -encourage you to claim it with appropriate copyright notices. This submission -then falls under the "otherwise noted" category. All submissions are strongly -encouraged to use the two-clause BSD license reproduced above. diff --git a/mibuild/README b/mibuild/README deleted file mode 100644 index df95d062c..000000000 --- a/mibuild/README +++ /dev/null @@ -1,27 +0,0 @@ -Mibuild (Milkymist Build system) - a build system and board database for Migen-based FPGA designs - -Quick intro: - -from migen.fhdl.std import * -from mibuild.platforms import m1 -plat = m1.Platform() -led = plat.request("user_led") -m = Module() -counter = Signal(26) -m.comb += led.eq(counter[25]) -m.sync += counter.eq(counter + 1) -plat.build_cmdline(m) - -Code repository: -https://github.com/milkymist/mibuild -Migen: -https://github.com/milkymist/migen -Experimental version of the Milkymist SoC based on Migen: -https://github.com/milkymist/milkymist-ng - -Mibuild is designed for Python 3.3. - -Send questions, comments and patches to devel [AT] lists.milkymist.org -Description files for new boards welcome. -We are also on IRC: #milkymist on the Freenode network. diff --git a/mibuild/mibuild/__init__.py b/mibuild/__init__.py similarity index 100% rename from mibuild/mibuild/__init__.py rename to mibuild/__init__.py diff --git a/mibuild/mibuild/altera_quartus.py b/mibuild/altera_quartus.py similarity index 100% rename from mibuild/mibuild/altera_quartus.py rename to mibuild/altera_quartus.py diff --git a/mibuild/mibuild/crg.py b/mibuild/crg.py similarity index 100% rename from mibuild/mibuild/crg.py rename to mibuild/crg.py diff --git a/mibuild/mibuild/generic_platform.py b/mibuild/generic_platform.py similarity index 100% rename from mibuild/mibuild/generic_platform.py rename to mibuild/generic_platform.py diff --git a/mibuild/mibuild/platforms/__init__.py b/mibuild/platforms/__init__.py similarity index 100% rename from mibuild/mibuild/platforms/__init__.py rename to mibuild/platforms/__init__.py diff --git a/mibuild/mibuild/platforms/de0nano.py b/mibuild/platforms/de0nano.py similarity index 100% rename from mibuild/mibuild/platforms/de0nano.py rename to mibuild/platforms/de0nano.py diff --git a/mibuild/mibuild/platforms/kc705.py b/mibuild/platforms/kc705.py similarity index 100% rename from mibuild/mibuild/platforms/kc705.py rename to mibuild/platforms/kc705.py diff --git a/mibuild/mibuild/platforms/lx9_microboard.py b/mibuild/platforms/lx9_microboard.py similarity index 100% rename from mibuild/mibuild/platforms/lx9_microboard.py rename to mibuild/platforms/lx9_microboard.py diff --git a/mibuild/mibuild/platforms/m1.py b/mibuild/platforms/m1.py similarity index 100% rename from mibuild/mibuild/platforms/m1.py rename to mibuild/platforms/m1.py diff --git a/mibuild/mibuild/platforms/mixxeo.py b/mibuild/platforms/mixxeo.py similarity index 100% rename from mibuild/mibuild/platforms/mixxeo.py rename to mibuild/platforms/mixxeo.py diff --git a/mibuild/mibuild/platforms/ml605.py b/mibuild/platforms/ml605.py similarity index 100% rename from mibuild/mibuild/platforms/ml605.py rename to mibuild/platforms/ml605.py diff --git a/mibuild/mibuild/platforms/papilio_pro.py b/mibuild/platforms/papilio_pro.py similarity index 100% rename from mibuild/mibuild/platforms/papilio_pro.py rename to mibuild/platforms/papilio_pro.py diff --git a/mibuild/mibuild/platforms/rhino.py b/mibuild/platforms/rhino.py similarity index 100% rename from mibuild/mibuild/platforms/rhino.py rename to mibuild/platforms/rhino.py diff --git a/mibuild/mibuild/platforms/roach.py b/mibuild/platforms/roach.py similarity index 100% rename from mibuild/mibuild/platforms/roach.py rename to mibuild/platforms/roach.py diff --git a/mibuild/setup.py b/mibuild/setup.py deleted file mode 100755 index 4322807b7..000000000 --- a/mibuild/setup.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python3 - -import sys, os -from setuptools import setup -from setuptools import find_packages - -here = os.path.abspath(os.path.dirname(__file__)) -README = open(os.path.join(here, "README")).read() - -required_version = (3, 3) -if sys.version_info < required_version: - raise SystemExit("Mibuild requires python {0} or greater".format( - ".".join(map(str, required_version)))) - -setup( - name="mibuild", - version="unknown", - description="Build system and board definitions for Migen FPGA designs", - long_description=README, - author="Sebastien Bourdeauducq", - author_email="sebastien@milkymist.org", - url="http://www.milkymist.org", - download_url="https://github.com/milkymist/mibuild", - packages=find_packages(here), - license="BSD", - platforms=["Any"], - keywords="HDL ASIC FPGA hardware design", - classifiers=[ - "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)", - "Environment :: Console", - "Development Status :: Alpha", - "Intended Audience :: Developers", - "License :: OSI Approved :: BSD License", - "Operating System :: OS Independent", - "Programming Language :: Python", - ], -) diff --git a/mibuild/mibuild/tools.py b/mibuild/tools.py similarity index 100% rename from mibuild/mibuild/tools.py rename to mibuild/tools.py diff --git a/mibuild/mibuild/xilinx_ise.py b/mibuild/xilinx_ise.py similarity index 100% rename from mibuild/mibuild/xilinx_ise.py rename to mibuild/xilinx_ise.py