From c6adb7b6b16975488443efdb7d48858566565a5b Mon Sep 17 00:00:00 2001 From: David Harris Date: Wed, 26 Jan 2022 18:16:34 +0000 Subject: [PATCH] Updated configs to fix GPIO address to match FU540 --- .gitignore | 2 ++ pipelined/config/buildroot/wally-config.vh | 2 +- pipelined/config/busybear/wally-config.vh | 2 +- pipelined/config/fpga/wally-config.vh | 2 +- pipelined/config/rv32e/wally-config.vh | 2 +- pipelined/config/rv32emc/wally-config.vh | 2 +- pipelined/config/rv32gc/wally-config.vh | 2 +- pipelined/config/rv32ic/wally-config.vh | 2 +- pipelined/config/rv32tim/wally-config.vh | 2 +- pipelined/config/rv64BP/wally-config.vh | 2 +- pipelined/config/rv64gc/wally-config.vh | 2 +- pipelined/config/rv64ic/wally-config.vh | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 4eadc503b..b745e3c63 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ wlft* testsBP/*/*/*.elf* testsBP/*/OBJ/* testsBP/*/*.a +tests/wally-riscv-arch-test/riscv-test-suite/*/I/*/* tests/linux-testgen/linux-testvectors/* !tests/linux-testgen/linux-testvectors/tvCopier.py !tests/linux-testgen/linux-testvectors/tvLinker.sh @@ -49,4 +50,5 @@ fpga/generator/*.jou *.signature.output examples/asm/sumtest/sumtest examples/asm/example/example +examples/C/sum/sum diff --git a/pipelined/config/buildroot/wally-config.vh b/pipelined/config/buildroot/wally-config.vh index 3cbd3f7dc..d88ec28ac 100644 --- a/pipelined/config/buildroot/wally-config.vh +++ b/pipelined/config/buildroot/wally-config.vh @@ -97,7 +97,7 @@ `define CLINT_BASE 56'h02000000 `define CLINT_RANGE 56'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 56'h10012000 +`define GPIO_BASE 56'h10060000 `define GPIO_RANGE 56'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 56'h10000000 diff --git a/pipelined/config/busybear/wally-config.vh b/pipelined/config/busybear/wally-config.vh index bd8671ceb..38cc37211 100644 --- a/pipelined/config/busybear/wally-config.vh +++ b/pipelined/config/busybear/wally-config.vh @@ -98,7 +98,7 @@ `define CLINT_BASE 56'h02000000 `define CLINT_RANGE 56'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 56'h10012000 +`define GPIO_BASE 56'h10060000 `define GPIO_RANGE 56'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 56'h10000000 diff --git a/pipelined/config/fpga/wally-config.vh b/pipelined/config/fpga/wally-config.vh index df40d7a33..85cf1fda3 100644 --- a/pipelined/config/fpga/wally-config.vh +++ b/pipelined/config/fpga/wally-config.vh @@ -104,7 +104,7 @@ `define CLINT_BASE 56'h02000000 `define CLINT_RANGE 56'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 56'h10012000 +`define GPIO_BASE 56'h10060000 `define GPIO_RANGE 56'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 56'h10000000 diff --git a/pipelined/config/rv32e/wally-config.vh b/pipelined/config/rv32e/wally-config.vh index 53541e737..e6f26a101 100644 --- a/pipelined/config/rv32e/wally-config.vh +++ b/pipelined/config/rv32e/wally-config.vh @@ -97,7 +97,7 @@ `define CLINT_BASE 34'h02000000 `define CLINT_RANGE 34'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 34'h10012000 +`define GPIO_BASE 34'h10060000 `define GPIO_RANGE 34'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 34'h10000000 diff --git a/pipelined/config/rv32emc/wally-config.vh b/pipelined/config/rv32emc/wally-config.vh index 28a195249..e9678351d 100644 --- a/pipelined/config/rv32emc/wally-config.vh +++ b/pipelined/config/rv32emc/wally-config.vh @@ -97,7 +97,7 @@ `define CLINT_BASE 34'h02000000 `define CLINT_RANGE 34'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 34'h10012000 +`define GPIO_BASE 34'h10060000 `define GPIO_RANGE 34'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 34'h10000000 diff --git a/pipelined/config/rv32gc/wally-config.vh b/pipelined/config/rv32gc/wally-config.vh index 3f96917e8..1f3f3c0a7 100644 --- a/pipelined/config/rv32gc/wally-config.vh +++ b/pipelined/config/rv32gc/wally-config.vh @@ -96,7 +96,7 @@ `define CLINT_BASE 34'h02000000 `define CLINT_RANGE 34'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 34'h10012000 +`define GPIO_BASE 34'h10060000 `define GPIO_RANGE 34'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 34'h10000000 diff --git a/pipelined/config/rv32ic/wally-config.vh b/pipelined/config/rv32ic/wally-config.vh index e59fc094b..21c307a80 100644 --- a/pipelined/config/rv32ic/wally-config.vh +++ b/pipelined/config/rv32ic/wally-config.vh @@ -96,7 +96,7 @@ `define CLINT_BASE 34'h02000000 `define CLINT_RANGE 34'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 34'h10012000 +`define GPIO_BASE 34'h10060000 `define GPIO_RANGE 34'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 34'h10000000 diff --git a/pipelined/config/rv32tim/wally-config.vh b/pipelined/config/rv32tim/wally-config.vh index bdc38f17b..d1ecb3756 100644 --- a/pipelined/config/rv32tim/wally-config.vh +++ b/pipelined/config/rv32tim/wally-config.vh @@ -96,7 +96,7 @@ `define CLINT_BASE 34'h02000000 `define CLINT_RANGE 34'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 34'h10012000 +`define GPIO_BASE 34'h10060000 `define GPIO_RANGE 34'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 34'h10000000 diff --git a/pipelined/config/rv64BP/wally-config.vh b/pipelined/config/rv64BP/wally-config.vh index 79acf4854..68d9696ed 100644 --- a/pipelined/config/rv64BP/wally-config.vh +++ b/pipelined/config/rv64BP/wally-config.vh @@ -101,7 +101,7 @@ `define CLINT_BASE 56'h02000000 `define CLINT_RANGE 56'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 56'h10012000 +`define GPIO_BASE 56'h10060000 `define GPIO_RANGE 56'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 56'h10000000 diff --git a/pipelined/config/rv64gc/wally-config.vh b/pipelined/config/rv64gc/wally-config.vh index 4483c20e2..cfe363216 100644 --- a/pipelined/config/rv64gc/wally-config.vh +++ b/pipelined/config/rv64gc/wally-config.vh @@ -102,7 +102,7 @@ `define CLINT_BASE 56'h02000000 `define CLINT_RANGE 56'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 56'h10012000 +`define GPIO_BASE 56'h10060000 `define GPIO_RANGE 56'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 56'h10000000 diff --git a/pipelined/config/rv64ic/wally-config.vh b/pipelined/config/rv64ic/wally-config.vh index 49abbce91..a532fc04b 100644 --- a/pipelined/config/rv64ic/wally-config.vh +++ b/pipelined/config/rv64ic/wally-config.vh @@ -102,7 +102,7 @@ `define CLINT_BASE 56'h02000000 `define CLINT_RANGE 56'h0000FFFF `define GPIO_SUPPORTED 1'b1 -`define GPIO_BASE 56'h10012000 +`define GPIO_BASE 56'h10060000 `define GPIO_RANGE 56'h000000FF `define UART_SUPPORTED 1'b1 `define UART_BASE 56'h10000000