Rename

Author: mmicko

devices.json

@@ -1,7 +1,7 @@
 {
-    "architectures": {
+    "families": {
         "eg4": {
-            "parts": {
+            "devices": {
                 "eagle_15": {
                     "packages": [
                         "BGA256X",
@@ -41,7 +41,7 @@
             }
         },
         "ef1": {
-            "parts": {
+            "devices": {
                 "elf_3": {
                     "packages": [
                         "LXLQFP100",
@@ -71,7 +71,7 @@
             }
         },
         "ef2": {
-            "parts": {
+            "devices": {
                 "ef2_1": {
                     "packages": [
                         "EF2L15LG100B",
@@ -122,7 +122,7 @@
             }
         },
         "ef3": {
-            "parts": {
+            "devices": {
                 "ef3_1": {
                     "packages": [
                         "EF3L15CG256B"
@@ -167,7 +167,7 @@
             }
         },
         "al3": {
-            "parts": {
+            "devices": {
                 "al3_6": {
                     "packages": [
                         "LQFP144",

tools/check_fuse_creation.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-For each architecture and part, decrypt all data and save it to raw file
+For each family and device, decrypt all data and save it to raw file
 """
 
 import argparse, sys, os
@@ -55,8 +55,8 @@ def main(argv):
 		help="Anlogic bitstream generated .bits file")
 	parser.add_argument("log_file", metavar="<log_file>.log", nargs="?",
 		help="Anlogic bitstream generated .log file")
-	parser.add_argument('part', type=str,
-		help="FPGA part (e.g. eagle_s20)")
+	parser.add_argument('device', type=str,
+		help="FPGA device (e.g. eagle_s20)")
 	args = parser.parse_args(argv[1:])	
 	log_file = args.log_file
 	bits_file = args.bits_file
@@ -73,8 +73,8 @@ def main(argv):
 		sys.exit()
 
 	tang_root = database.get_tangdinasty_root()
-	chipdb = os.path.join(tang_root, "arch", args.part + ".db") 
-	unlogic.decode_chipdb(["decrypt_all", chipdb, "--datadir", os.path.join("work_decrypt",args.part)])
+	chipdb = os.path.join(tang_root, "arch", args.device + ".db") 
+	unlogic.decode_chipdb(["decrypt_all", chipdb, "--datadir", os.path.join("work_decrypt",args.device)])
 	print()
 	extract_elements(bits_file,log_file)
 

tools/decrypt_all.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-For each architecture and part, decrypt all data and save it to raw file
+For each family and device, decrypt all data and save it to raw file
 """
 
 import os
@@ -17,16 +17,16 @@ def main():
 	shutil.rmtree("work_decrypt", ignore_errors=True)
 	os.mkdir("work_decrypt")
 	print("Decrypting all chipdb files...")
-	for architecture in devices["architectures"].keys():
-		print("Architecture: " + architecture)
-		for part in devices["architectures"][architecture]["parts"].keys():
-			print("Part: " + part)
-			selected_part = devices["architectures"][architecture]["parts"][part]
-			package = selected_part["packages"][0]
-			os.mkdir(path.join("work_decrypt",part))
-			unc_file = path.join("work_decrypt", part + ".unc")
-			chipdb = path.join(tang_root, "arch", part + ".db") 
-			unlogic.decode_chipdb(["decrypt_all", chipdb, "--decrypt", unc_file, "--datadir", path.join("work_decrypt",part)])
+	for family in devices["families"].keys():
+		print("Family: " + family)
+		for device in devices["families"][family]["devices"].keys():
+			print("Device: " + device)
+			selected_device = devices["families"][family]["devices"][device]
+			package = selected_device["packages"][0]
+			os.mkdir(path.join("work_decrypt",device))
+			unc_file = path.join("work_decrypt", device + ".unc")
+			chipdb = path.join(tang_root, "arch", device + ".db") 
+			unlogic.decode_chipdb(["decrypt_all", chipdb, "--decrypt", unc_file, "--datadir", path.join("work_decrypt",device)])
 
 if __name__ == "__main__":
 	main()

tools/get_tilegrid_all.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-For each architecture and part, obtain a tilegrid and save it in the database
+For each family and device, obtain a tilegrid and save it in the database
 """
 
 import os
@@ -14,16 +14,16 @@
 def main():
 	devices = database.get_devices()
 	tang_root = database.get_tangdinasty_root()
-	for architecture in devices["architectures"].keys():
-		print("Architecture: " + architecture)
-		for part in devices["architectures"][architecture]["parts"].keys():
-			print("Part: " + part)
-			selected_part = devices["architectures"][architecture]["parts"][part]
-			package = selected_part["packages"][0]
+	for family in devices["families"].keys():
+		print("Family: " + family)
+		for device in devices["families"][family]["devices"].keys():
+			print("Device: " + device)
+			selected_device = devices["families"][family]["devices"][device]
+			package = selected_device["packages"][0]
 
-			json_file = path.join(database.get_db_subdir(architecture, part), "tilegrid.json")
-			chipdb = path.join(tang_root, "arch", part + ".db") 
-			unlogic.decode_chipdb(["get_tilegrid_all", chipdb, "--tilegrid", json_file, "--datadir", path.join("work_decrypt",part)])
+			json_file = path.join(database.get_db_subdir(family, device), "tilegrid.json")
+			chipdb = path.join(tang_root, "arch", device + ".db") 
+			unlogic.decode_chipdb(["get_tilegrid_all", chipdb, "--tilegrid", json_file, "--datadir", path.join("work_decrypt",device)])
 
 if __name__ == "__main__":
 	main()

tools/html_all.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-For each architecture and part, create tilegrid html
+For each family and device, create tilegrid html
 """
 
 import os, time
@@ -43,15 +43,15 @@ def main():
 	build_dt = time.strftime('%Y-%m-%d %H:%M:%S')
 
 	docs_toc = ""
-	for architecture in sorted(devices["architectures"].keys()):
-		print("Architecture: " + architecture)
-		docs_toc += "<h3>{} Architecture</h3>".format(architecture.upper())
+	for family in sorted(devices["families"].keys()):
+		print("Family: " + family)
+		docs_toc += "<h3>{} Family</h3>".format(family.upper())
 		docs_toc += "<h4>Bitstream Documentation</h4>"
 		docs_toc += "<ul>"
-		for part in sorted(devices["architectures"][architecture]["parts"].keys()):
-			print("Part: " + part)
-			docs_toc += '<li><a href="{}">{} Documentation</a></li>'.format('{}.html'.format(part),part.upper())
-			html_tilegrid.main(["html_tilegrid", architecture,  part, path.join("work_html",part + ".html")])
+		for device in sorted(devices["families"][family]["devices"].keys()):
+			print("Device: " + device)
+			docs_toc += '<li><a href="{}">{} Documentation</a></li>'.format('{}.html'.format(device),device.upper())
+			html_tilegrid.main(["html_tilegrid", family,  device, path.join("work_html",device + ".html")])
 		docs_toc += "</ul>"
 	index_html = Template(tang_docs_index).substitute(
 		datetime=build_dt,

tools/html_tilegrid.py

@@ -7,10 +7,10 @@
 import database
 
 parser = argparse.ArgumentParser(description=__doc__)
-parser.add_argument('architecture', type=str,
-					help="FPGA architecture (e.g. eg4)")
-parser.add_argument('part', type=str,
-					help="FPGA part (e.g. eagle_s20)")
+parser.add_argument('family', type=str,
+					help="FPGA family (e.g. eg4)")
+parser.add_argument('device', type=str,
+					help="FPGA device (e.g. eagle_s20)")
 parser.add_argument('outfile', type=argparse.FileType('w'),
 					help="output HTML file")
 
@@ -40,8 +40,8 @@ def get_colour(ttype):
 
 def main(argv):
 	args = parser.parse_args(argv[1:])
-	tilegrid = database.get_tilegrid(args.architecture, args.part)
-	device_info = database.get_devices()["architectures"][args.architecture]["parts"][args.part]
+	tilegrid = database.get_tilegrid(args.family, args.device)
+	device_info = database.get_devices()["families"][args.family]["devices"][args.device]
 
 	max_row = device_info["max_row"]
 	max_col = device_info["max_col"]
@@ -68,7 +68,7 @@ def main(argv):
 			<body>
 			<h1>{} Tilegrid</h1>
 			<table style='font-size: 8pt; border: 2px solid black; text-align: center'>
-		""".format(args.part.upper(), args.part.upper()), file=f)
+		""".format(args.device.upper(), args.device.upper()), file=f)
 	for trow in tiles:
 		print("<tr>", file=f)
 		row_max_height = 0

util/common/database.py

@@ -32,16 +32,16 @@ def get_db_root():
         return path.join(get_tang_root(), "database")
 
 
-def get_db_subdir(architecture = None, part = None, package = None):
+def get_db_subdir(family = None, device = None, package = None):
     """
-    Return the DB subdirectory corresponding to a architecture, part and
+    Return the DB subdirectory corresponding to a family, device and
     package (all if applicable), creating it if it doesn't already
     exist.
     """
     subdir = get_db_root()
     if not path.exists(subdir):
         os.mkdir(subdir)
-    dparts = [architecture, part, package]
+    dparts = [family, device, package]
     for dpart in dparts:
         if dpart is None:
             break
@@ -51,11 +51,11 @@ def get_db_subdir(architecture = None, part = None, package = None):
     return subdir
 
 
-def get_tilegrid(architecture, part):
+def get_tilegrid(family, device):
     """
-    Return the deserialised tilegrid for a architecture, part
+    Return the deserialised tilegrid for a family, device
     """
-    tgjson = path.join(get_db_subdir(architecture, part), "tilegrid.json")
+    tgjson = path.join(get_db_subdir(family, device), "tilegrid.json")
     with open(tgjson, "r") as f:
         return json.load(f)