From 9408699b35a7fe343821afdb8cb164754ed80dda Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Wed, 28 Jun 2023 17:12:31 +0100
Subject: [PATCH] changed imem to rom to allow initial program loading, updated
bootloader code and added accelerator option to makefile
---
makefile | 6 +++---
software/common/bootloader/bootloader.c | 2 +-
.../nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v | 3 ++-
xmprep.history | 1 -
4 files changed, 6 insertions(+), 6 deletions(-)
delete mode 100644 xmprep.history
diff --git a/makefile b/makefile
index ff888a7..5033f6b 100644
--- a/makefile
+++ b/makefile
@@ -85,13 +85,13 @@ BOOTROM_BUILD_DIR ?= $(SOCLABS_PROJECT_DIR)/system/src/bootrom
QUICKSTART ?= no
-NANOSOC_EXPANSION_REGION ?= yes
+ACCELERATOR ?= no
# Simulator Defines
DEFINES_VC += $(MEM_INIT) +define+CORTEX_M0 +define+USE_TARMAC
-ifeq ($(NANOSOC_EXPANSION_REGION),yes)
- DEFINES_VC += +define+NANOSOC_EXPANSION_REGION
+ifeq ($(ACCELERATOR),yes)
+ DEFINES_VC += +define+ACCELERATOR_SUBSYSTEM
endif
# System Design Filelist
diff --git a/software/common/bootloader/bootloader.c b/software/common/bootloader/bootloader.c
index 233c44b..fed5b51 100644
--- a/software/common/bootloader/bootloader.c
+++ b/software/common/bootloader/bootloader.c
@@ -135,7 +135,7 @@ int main (void)
// UART init
UartStdOutInit();
- UartPuts("\n\n\nSOCLABS: ARM Cortex-M0 nanosoc\n");
+ UartPuts("\n\n\nSoCLabs NanoSoC\n");
FlashLoader();
return 0;
}
diff --git a/system/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v b/system/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v
index 672a0f1..fced8f0 100644
--- a/system/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v
+++ b/system/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v
@@ -37,7 +37,8 @@ module nanosoc_region_imem_0 #(
);
// SRAM Instantiation
- sl_ahb_sram #(
+ // sl_ahb_sram #(
+ sl_ahb_rom #(
.SYS_DATA_W (SYS_DATA_W),
.RAM_ADDR_W (IMEM_RAM_ADDR_W),
.RAM_DATA_W (IMEM_RAM_DATA_W),
diff --git a/xmprep.history b/xmprep.history
deleted file mode 100644
index d874832..0000000
--- a/xmprep.history
+++ /dev/null
@@ -1 +0,0 @@
-s1(22Jun2023:09:30:49): xmprep +overwrite -f /home/dam1n19/accelerator-project/flist/project/system.flist -define ADP_FILE="/home/dam1n19/accelerator-project/nanosoc_tech/testcodes/adp_demo/adp.cmd" +define+CORTEX_M0 +define+USE_TARMAC +define+NANOSOC_EXPANSION_REGION +debug -timescale 1ps/1ps -top nanosoc_tb
--
GitLab