From: Adrian Herrera <adrian.herrera@arm.com>
Date: Fri, 21 Feb 2020 11:05:28 +0000 (+0000)
Subject: dev-arm: Add flash0 memory to VExpress_GEM5 platform
X-Git-Tag: v20.0.0.0~445
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=873ca617300d335f13db9ae9c573ce0d99ba8f5c;p=gem5.git

dev-arm: Add flash0 memory to VExpress_GEM5 platform

This memory is present in the VE RS1 memory map

Change-Id: Ia00c802f137d8a82c93b984f4043ba9f7fd8027a
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Adrian Herrera <adrian.herrera@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/25983
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 039df101d..b9bb0d89e 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -879,7 +879,7 @@ References:
 Memory map:
    0x00000000-0x03ffffff: Boot memory (CS0)
    0x04000000-0x07ffffff: Reserved
-   0x08000000-0x0bffffff: Reserved (CS0 alias)
+   0x08000000-0x0bffffff: NOR FLASH0 (CS0 alias)
    0x0c000000-0x0fffffff: Reserved (Off-chip, CS4)
    0x10000000-0x13ffffff: gem5-specific peripherals (Off-chip, CS5)
        0x10000000-0x1000ffff: gem5 energy controller
@@ -970,6 +970,10 @@ Interrupts:
     bootmem = SimpleMemory(range=AddrRange(0, size='64MB'),
                            conf_table_reported=False)
 
+    # NOR flash, flash0
+    flash0 = SimpleMemory(range=AddrRange(0x08000000, size='64MB'),
+                          conf_table_reported=False)
+
     # Platform control device (off-chip)
     realview_io = RealViewCtrl(proc_id0=0x14000000, proc_id1=0x14000000,
                                idreg=0x02250000, pio_addr=0x1c010000)
@@ -993,6 +997,7 @@ Interrupts:
     def _on_chip_memory(self):
         memories = [
             self.bootmem,
+            self.flash0,
         ]
         return memories