From d5eb867e45c6131ff77747cc2b44e02dd7fadc22 Mon Sep 17 00:00:00 2001 From: Yvan Tortorella Date: Mon, 4 Dec 2023 08:54:19 +0100 Subject: [PATCH] Correct HMR base address in memory map. --- hw/bootrom/cheshire_bootrom.sv | 2 +- hw/cheshire_pkg.sv | 2 +- sw/include/params.h | 1 + sw/link/common.ldh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/bootrom/cheshire_bootrom.sv b/hw/bootrom/cheshire_bootrom.sv index 979ebaf9..a1b81e7a 100644 --- a/hw/bootrom/cheshire_bootrom.sv +++ b/hw/bootrom/cheshire_bootrom.sv @@ -85,7 +85,7 @@ module cheshire_bootrom #( 053: data_o = 32'h0397f322 /* 0x00d4 */; 054: data_o = 32'h83930100 /* 0x00d8 */; 055: data_o = 32'ha383f2a3 /* 0x00dc */; - 056: data_o = 32'hc31704c3 /* 0x00e0 */; + 056: data_o = 32'hb31704c3 /* 0x00e0 */; 057: data_o = 32'h03130100 /* 0x00e4 */; 058: data_o = 32'h2303f1e3 /* 0x00e8 */; 059: data_o = 32'hd3b32003 /* 0x00ec */; diff --git a/hw/cheshire_pkg.sv b/hw/cheshire_pkg.sv index 9a89bdc5..96568886 100644 --- a/hw/cheshire_pkg.sv +++ b/hw/cheshire_pkg.sv @@ -284,7 +284,7 @@ package cheshire_pkg; localparam doub_bt AmSlink = 'h0300_6000; localparam doub_bt AmBusErr = 'h0300_8000; localparam doub_bt AmTagger = 'h0300_A000; - localparam doub_bt AmHmrUnit = 'h0300_C000; + localparam doub_bt AmHmrUnit = 'h0300_B000; localparam doub_bt AmSpm = 'h1000_0000; // Cached region at bottom, uncached on top localparam doub_bt AmClic = 'h0800_0000; diff --git a/sw/include/params.h b/sw/include/params.h index b1e6990f..d8183dad 100644 --- a/sw/include/params.h +++ b/sw/include/params.h @@ -23,6 +23,7 @@ extern void *__base_gpio; extern void *__base_slink; extern void *__base_vga; extern void *__base_clint; +extern void *__base_hmr; extern void *__base_plic; extern void *__base_dma; extern void *__base_axirt; diff --git a/sw/link/common.ldh b/sw/link/common.ldh index a5e26b28..f3a9a40c 100644 --- a/sw/link/common.ldh +++ b/sw/link/common.ldh @@ -43,7 +43,7 @@ SECTIONS { __base_gpio = 0x03005000; __base_slink = 0x03006000; __base_vga = 0x03007000; - __base_hmr = 0x0300C000; + __base_hmr = 0x0300B000; __base_plic = 0x04000000; __base_spm = ORIGIN(spm); __base_dram = ORIGIN(dram);