Removed the nodeinfo.json file which should not be in the
distribution files. Added a section to the nodeinfo.json installed
file that includes the version numbers for both open_pdks and for
magic, so that it is clear what version of magic was used to build
the PDK.
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 6e69f2d..5a00f22 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -318,6 +318,8 @@
COMMIT_DEFS += -DFD_SC_LS_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_ls/latest)
COMMIT_DEFS += -DFD_SC_LP_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_lp/latest)
endif
+COMMIT_DEFS += -DMAGIC_VERSION=$(shell magic -dnull -noconsole --version)
+COMMIT_DEFS += -DOPEN_PDKS_VERSION=$(shell cat ../VERSION)
ifeq (${EF_STYLE}, 1)
EF_FORMAT = -ef_format
diff --git a/sky130/nodeinfo.json b/sky130/nodeinfo.json
deleted file mode 100644
index 28a2a0b..0000000
--- a/sky130/nodeinfo.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "foundry" : "SW",
- "foundry-name" : "SkyWater",
- "node" : "sky130A",
- "feature-size" : "130nm",
- "status" : "active",
- "commit" : "1c74f85cd8dbb6c0cf514316b127d746d35d829b",
- "description" : "Skywater 0.13um CMOS, local interconntect + high-resistance poly + 5 metal layer backend stack + MiM caps + redistribution layer",
- "options" : [
- "METAL5",
- "MIM",
- "REDISTRIBUTION"
- ],
- "stdcells" : [
- "sky130_fd_sc_hd" : "ac7fb61f06e6470b94e8afdf7c25268f62fbd7b1",
- "sky130_fd_sc_hdll" : "0694bd23893de20f5233ef024acf6cca1e750ac6",
- "sky130_fd_sc_hs" : "1d051f49bfe4e2fe9108d702a8bc2e9c081005a4",
- "sky130_fd_sc_hvl" : "4fd4f858d16c558a6a488b200649e909bb4dd800",
- "sky130_fd_sc_lp" : "e2c1e0646999163d35ea7b2521c3ec5c28633e63",
- "sky130_fd_sc_ls" : "4f549e30dd91a1c264f8895e07b2872fe410a8c2",
- "sky130_fd_sc_ms" : "ae1b7f68821505cf2d93d9d44cce5ece22710fad",
- "sky130_osu_sc" : "unknown",
- "sky130_osu_sc_t12" : "unknown",
- "sky130_osu_sc_t15" : "unknown",
- "sky130_osu_sc_t18" : "unknown"
- ],
- "iocells" : [
- "sky130_fd_io" : "01b18699b4102d8e54ad1406b3991ecb652e5aee"
- ]
- "primitive" : [
- "sky130_fd_pr" : "f62031a1be9aefe902d6d54cddd6f59b57627436"
- ]
- "memory" : [
- "sky130_sram_macros" : "a2a737043f68ac5058aa6e62241eb3ce2a7bc062"
- ]
- "other" : [
- "sky130_ml_xx_hd" : "6eb3b0718552b034f1bf1870285ff135e3fb2dcb"
- ]
-}
diff --git a/sky130/sky130.json b/sky130/sky130.json
index df875be..8447ca7 100644
--- a/sky130/sky130.json
+++ b/sky130/sky130.json
@@ -63,4 +63,8 @@
"other" : [
"sky130_ml_xx_hd" : "ALPHA_COMMIT"
]
+ "build" : [
+ "magic" : "MAGIC_VERSION",
+ "open_pdks" : "OPEN_PDKS_VERSION"
+ ]
}
