Skip to content

Commit d0be5ba

Browse files
Fix up some typos and make these blocks generate .json
1 parent b615dba commit d0be5ba

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

hdl/ip/vhd/espi/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rdl_file(
1818
rdl_file(
1919
name = "espi_regs_rdl",
2020
src = "sys_regs/espi_regs.rdl",
21-
outputs = ["espi_regs_pkg.vhd", "espi_regs.html"],
21+
outputs = ["espi_regs_pkg.vhd", "espi_regs.html", "espi_regs.json"],
2222
visibility = ['PUBLIC']
2323
)
2424

hdl/ip/vhd/espi/sys_regs/espi_regs.rdl

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ addrmap espi_regs {
9595
name = "Command FIFO Byte Count FIFO";
9696
desc = "";
9797
field {
98-
desc = "store command byte size in fifo. Beacause we are sending 4bytes at a time into the fifo, but only reading
98+
desc = "store command byte size in fifo. Because we are sending 4bytes at a time into the fifo, but only reading
9999
1 byte at a time, we need to store the number of cmd bytes in the fifo. This allows queueing up multiple commands
100100
if desired. left over data bytes are discarded if this fifo is empty and there are <4 bytes left in cmd_fifo";
101101
} fifo_data[7:0] = 0;

hdl/ip/vhd/info/BUCK

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ load("//tools:rdl.bzl", "rdl_file")
44
rdl_file(
55
name = "info_regs_rdl",
66
src = "info_regs.rdl",
7-
outputs = ["info_regs_pkg.vhd", "info_regs.html"],
7+
outputs = ["info_regs_pkg.vhd", "info_regs.html", "info_regs.json"],
88
visibility = ['PUBLIC']
99
)
1010

1111
# Janky generate git sha via genrule
1212
# There are a lot of better ways this might be done, but this was the simplest.
1313
# It does mean there's a re-build for any change to the git repo, but for now that's fine.
1414
# Longer-term, we might evaluate backannotating ROMs or something with this build info
15+
# This also breaks windows due to shell use
1516
genrule(
1617
name = "git_sha",
1718
out = "git_sha_pkg.vhd",

hdl/ip/vhd/info/info_2k8.vhd

+3-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,9 @@ begin
109109
hubris_compat <= rec_reset;
110110
scratchpad <= rec_reset;
111111
elsif rising_edge(clk) then
112-
-- go ahead and flo this every cycle, it's external but not
113-
-- changing
112+
-- go ahead and flop this every cycle, it's external but not
113+
-- changing. Since we're not using this in decision logic, this should
114+
-- suffice for synchronization.
114115
hubris_compat <= unpack(resize(hubris_compat_pins, 32));
115116
if wready then
116117
case to_integer(awaddr) is

0 commit comments

Comments
 (0)