From 7badb453b882f909fca2e919585a9899fd1aa977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <zulian@eit.uni-kl.de>
Date: Fri, 2 Nov 2018 17:57:34 +0100
Subject: [PATCH] Fixes and improvements

---
 DRAMSys/gem5/configs/boot_linux.ini | 37 ++++++++++++++++++++++++-----
 utils/build.sh                      | 35 ++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/DRAMSys/gem5/configs/boot_linux.ini b/DRAMSys/gem5/configs/boot_linux.ini
index d2cee286..471e37de 100644
--- a/DRAMSys/gem5/configs/boot_linux.ini
+++ b/DRAMSys/gem5/configs/boot_linux.ini
@@ -986,25 +986,50 @@ pio=system.iobus.master[22]
 
 [system.realview.generic_timer]
 type=GenericTimer
+children=int_hyp int_phys_ns int_phys_s int_virt
 clk_domain=system.clk_domain
 default_p_state=UNDEFINED
 eventq_index=0
-gic=system.realview.gic
-int_hyp=26
-int_phys_ns=30
-int_phys_s=29
-int_virt=27
+int_hyp=system.realview.generic_timer.int_hyp
+int_phys_ns=system.realview.generic_timer.int_phys_ns
+int_phys_s=system.realview.generic_timer.int_phys_s
+int_virt=system.realview.generic_timer.int_virt
 p_state_clk_gate_bins=20
 p_state_clk_gate_max=1000000000000
 p_state_clk_gate_min=1000
 power_model=
 system=system
 
+[system.realview.generic_timer.int_hyp]
+type=ArmPPI
+eventq_index=0
+num=26
+platform=system.realview
+
+[system.realview.generic_timer.int_phys_ns]
+type=ArmPPI
+eventq_index=0
+num=30
+platform=system.realview
+
+[system.realview.generic_timer.int_phys_s]
+type=ArmPPI
+eventq_index=0
+num=29
+platform=system.realview
+
+[system.realview.generic_timer.int_virt]
+type=ArmPPI
+eventq_index=0
+num=27
+platform=system.realview
+
 [system.realview.gic]
-type=Pl390
+type=GicV2
 clk_domain=system.clk_domain
 cpu_addr=738205696
 cpu_pio_delay=10000
+cpu_size=8192
 default_p_state=UNDEFINED
 dist_addr=738201600
 dist_pio_delay=10000
diff --git a/utils/build.sh b/utils/build.sh
index 2cdea6a9..e3e7da79 100755
--- a/utils/build.sh
+++ b/utils/build.sh
@@ -1,4 +1,37 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+# Copyright (c) 2018, University of Kaiserslautern
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Author: Éder F. Zulian
+
 if [[ $(hostname -s) =~ ^head[0-9]+$ ]] || [[ $(hostname -s) =~ ^node[0-9]+$ ]]; then
 	# Elwetritsch cluster - heads or nodes
 	module load qt/5.5