Skip to content

Commit 7c9a7ee

Browse files
committedSep 28, 2015
build: cleanup
1 parent 09003a5 commit 7c9a7ee

File tree

2 files changed

+4
-35
lines changed

2 files changed

+4
-35
lines changed
 

Diff for: ‎migen/build/generic_platform.py

+4-23
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import os
2-
import sys
32

43
from migen.fhdl.structure import Signal
54
from migen.genlib.record import Record
65
from migen.genlib.io import CRG
76
from migen.fhdl import verilog, edif
8-
from migen.util.misc import autotype
97
from migen.build import tools
108

119

@@ -282,17 +280,13 @@ def do_finalize(self, fragment, *args, **kwargs):
282280
def add_source(self, filename, language=None, library=None):
283281
if language is None:
284282
language = tools.language_by_filename(filename)
285-
286283
if language is None:
287-
language = "verilog" # default to Verilog
284+
language = "verilog"
288285

289286
if library is None:
290-
library = "work" # default to work
287+
library = "work"
291288

292-
filename = os.path.abspath(filename)
293-
if sys.platform == "win32" or sys.platform == "cygwin":
294-
filename = filename.replace("\\", "/")
295-
self.sources.add((filename, language, library))
289+
self.sources.add((os.path.abspath(filename), language, library))
296290

297291
def add_sources(self, path, *filenames, language=None, library=None):
298292
for f in filenames:
@@ -314,10 +308,7 @@ def add_source_dir(self, path, recursive=True, library=None):
314308
self.add_source(filename, language, library)
315309

316310
def add_verilog_include_path(self, path):
317-
path = os.path.abspath(path)
318-
if sys.platform == "win32" or sys.platform == "cygwin":
319-
path = path.replace("\\", "/")
320-
self.verilog_include_paths.add(path)
311+
self.verilog_include_paths.add(os.path.abspath(path))
321312

322313
def resolve_signals(self, vns):
323314
# resolve signal names in constraints
@@ -348,15 +339,5 @@ def get_edif(self, fragment, cell_library, vendor, device, **kwargs):
348339
def build(self, fragment):
349340
raise NotImplementedError("GenericPlatform.build must be overloaded")
350341

351-
def build_cmdline(self, *args, **kwargs):
352-
arg = sys.argv[1:]
353-
if len(arg) % 2:
354-
print("Missing value for option: {}".format(sys.argv[-1]))
355-
sys.exit(1)
356-
357-
argdict = dict((k, autotype(v)) for k, v in zip(*[iter(arg)] * 2))
358-
kwargs.update(argdict)
359-
self.build(*args, **kwargs)
360-
361342
def create_programmer(self):
362343
raise NotImplementedError

Diff for: ‎migen/util/misc.py

-12
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,6 @@ def xdir(obj, return_values=False):
2020
yield attr
2121

2222

23-
def autotype(s):
24-
if s == "True":
25-
return True
26-
elif s == "False":
27-
return False
28-
try:
29-
return int(s, 0)
30-
except ValueError:
31-
pass
32-
return s
33-
34-
3523
def gcd_multiple(numbers):
3624
l = len(numbers)
3725
if l == 1:

0 commit comments

Comments
 (0)
Please sign in to comment.