Vast and substantial changes: Removed the old GPIO control with the new one
that implements a shift register around the perimeter of the chip, to control
most aspects of each GPIO pad locally to avoid excessive wiring. Added modules
for the metal-programmed user ID, two counter-timers, and a general-purpose SPI
master. The SPI master can be internally directly connected to the SPI slave,
so the processor can access the housekeeping SPI in the same way as an external
host. Most signals other than 1 GPIO pin and the SPI flash controller pins were
remapped to pads in the user area, where they are active on startup and until
they are programmed for user use from the management processor. There are
several known syntax issues that need to be fixed; this is a work in progress.
diff --git a/verilog/rtl/sysctrl.v b/verilog/rtl/sysctrl.v
index 9d66e66..62ed4fc 100644
--- a/verilog/rtl/sysctrl.v
+++ b/verilog/rtl/sysctrl.v
@@ -2,8 +2,7 @@
parameter BASE_ADR = 32'h2F00_0000,
parameter PLL_OUT = 8'h0c,
parameter TRAP_OUT = 8'h10,
- parameter IRQ7_SRC = 8'h14,
- parameter IRQ8_SRC = 8'h18
+ parameter IRQ7_SRC = 8'h14
) (
input wb_clk_i,
input wb_rst_i,
@@ -20,8 +19,7 @@
output pll_output_dest,
output trap_output_dest,
- output irq_7_inputsrc,
- output irq_8_inputsrc
+ output irq_7_inputsrc
);
@@ -40,8 +38,7 @@
.BASE_ADR(BASE_ADR),
.PLL_OUT(PLL_OUT),
.TRAP_OUT(TRAP_OUT),
- .IRQ7_SRC(IRQ7_SRC),
- .IRQ8_SRC(IRQ8_SRC)
+ .IRQ7_SRC(IRQ7_SRC)
) sysctrl (
.clk(wb_clk_i),
.resetn(resetn),
@@ -56,8 +53,7 @@
.pll_output_dest(pll_output_dest),
.trap_output_dest(trap_output_dest),
- .irq_7_inputsrc(irq_7_inputsrc),
- .irq_8_inputsrc(irq_8_inputsrc)
+ .irq_7_inputsrc(irq_7_inputsrc)
);
endmodule
@@ -66,8 +62,7 @@
parameter BASE_ADR = 32'h2300_0000,
parameter PLL_OUT = 8'h0c,
parameter TRAP_OUT = 8'h10,
- parameter IRQ7_SRC = 8'h14,
- parameter IRQ8_SRC = 8'h18
+ parameter IRQ7_SRC = 8'h14
) (
input clk,
input resetn,
@@ -81,27 +76,23 @@
output pll_output_dest,
output trap_output_dest,
- output irq_7_inputsrc,
- output irq_8_inputsrc
+ output irq_7_inputsrc
);
reg pll_output_dest;
reg trap_output_dest;
reg irq_7_inputsrc;
- reg irq_8_inputsrc;
assign pll_out_sel = (iomem_addr[7:0] == PLL_OUT);
assign trap_out_sel = (iomem_addr[7:0] == TRAP_OUT);
assign irq7_sel = (iomem_addr[7:0] == IRQ7_SRC);
- assign irq8_sel = (iomem_addr[7:0] == IRQ8_SRC);
always @(posedge clk) begin
if (!resetn) begin
pll_output_dest <= 0;
trap_output_dest <= 0;
irq_7_inputsrc <= 0;
- irq_8_inputsrc <= 0;
end else begin
iomem_ready <= 0;
if (iomem_valid && !iomem_ready && iomem_addr[31:8] == BASE_ADR[31:8]) begin
@@ -122,11 +113,6 @@
if (iomem_wstrb[0])
irq_7_inputsrc <= iomem_wdata[0];
- end else if (irq8_sel) begin
- iomem_rdata <= {31'd0, irq_8_inputsrc};
- if (iomem_wstrb[0])
- irq_8_inputsrc <= iomem_wdata[0];
-
end
end
end
