From 16cbd15f4728260e5e9558ad27a82710b5162273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Wed, 6 May 2015 10:51:07 +0200
Subject: [PATCH 1/9] Readme file updated with information about dramSys
 configuration

---
 README.md | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 136 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 49080653..bac9ac77 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,7 @@ Generic DRAM controller simulator and debug tools related to it.
 
 # Basic Setup
 
-In a terminal window execute the commands that follow (the '$' symbolizes the
-terminal prompt).
+In a terminal window execute the commands that follow.
 
 Go to your home directory.
 
@@ -33,7 +32,7 @@ In case of doubts about which repository you should clone ask your supervisor.
 $ git clone https://<user>@git.rhrk.uni-kl.de/<user>/dram.vp.system.git
 ```
 
-Go to the projetct directory.
+Go to the project directory.
 
 ```
 $ cd dram.vp.system
@@ -78,10 +77,130 @@ $ qmake ../dramSys/dramSys.pro
 $ make
 ```
 
- 
-# DRAMSys Resources
+### DRAMSys Configuration
 
-The simulator's configuration is done via some files. You can find such configuration files in the directory below and its sub-directories.
+The **dramSys** executable supports one argument which is a XML file that
+contains configurable aspects of the desired simulation. If no argument is
+passed through the command line a default configuration file will be loaded.
+
+The XML code below shows a typical simulation configuration:
+
+```
+<simulation>
+        <simconfig>
+                    <Debug value="1" />
+                    <DatabaseRecording value="1" />
+                    <PowerAnalysys value="1" />
+        </simconfig>
+        <memspecs>
+                <memspec src="../resources/configs/memspecs/WideIO.xml"></memspec>
+        </memspecs>
+        <addressmappings>
+                <addressmapping src="../resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+        </addressmappings>
+        <memconfigs>
+           <memconfig src="../resources/configs/memconfigs/fifo.xml"/>
+        </memconfigs>
+
+<tracesetups>
+      <tracesetup id="fifo">
+       <device clkMhz="200">voco2.stl</device>
+</tracesetup>
+  </tracesetups>
+</simulation>
+```
+
+Some configuration fields reference other XML files which contain more
+specialized chunks of the configuration, e.g. memory specification and address
+mapping.
+
+The XML configuration files are parsed by the program and the configuration
+details extracted are assigned to the correspondent attributes of the internal
+configuration structure.
+
+
+#### Configuration File Sections
+
+The main configuration file is divided into self-contained sections, each of
+these sections is a set of logically related configuration aspects for the
+simulation.
+
+The list below, which is not intended to be exhaustive, present the
+configuration sections and possible configuration fields.
+
+- Simulator configuration
+  - Database recording
+  - Power analysis
+  - Debug mode
+
+- Memory specification
+  - Memory ID: JEDEC_256Mb_WIDEIO_SDR-200_128bit,
+    MICRON_4Gb_DDR4-2400_8bit_A, ...
+  - Memory type: WIDEIO_SD, DDR4, ...
+
+- Memory Architecture Specification
+  - Width
+  - Number of Banks
+  - Number of Ranks
+  - Number of Columns
+  - Number of Rows
+  - Data Rate
+  - Burst Length
+
+- Memory Timing Specification (memory dependent)
+  - Clock in MHz
+  - RC
+  - RCD
+  - RL
+  - RP
+  - RFC
+  - RAS
+  - WL
+  - AL
+  - DQSCK
+  - RTP
+  - WR
+  - XP
+  - XPDLL
+  - XS
+  - XSDLL
+  - REFI
+  - CL
+  - TAW
+  - RRD
+  - CCD
+  - WTR
+  - CKE
+  - CKESR
+
+- Memory Power Specification
+
+- Address Mapping
+  - Length: address length in bits
+  - Row: bits used for the row
+  - Bank:  bits used for the bank
+  - Column: bits used for the column
+
+- Memory Configuration
+  - Bankwise Logic
+  - Open Page Policy
+  - Maximum Number of Transactions
+  - Scheduler
+  - Capacitor size
+  - Powerdown Mode
+  - Powerdown Timeout
+  - Chip seed
+  - CSV file
+  - Storage Mode value
+
+
+Some attributes are self-explanatory while others require some previous
+knowhow of memory technologies or some knowledge of the simulator source code.
+
+## DRAMSys Resources
+
+Some resources of the simulator are available in the **resources** directory
+its sub-directories.
 
 ```
 $ cd /projects/dram.vp.system/dram/resources
@@ -89,9 +208,15 @@ $ cd /projects/dram.vp.system/dram/resources
 
 A short description of the content each directory follows.
 
-* resources
-  * configs - XML files used for configurate specific details of the simulation.
-  * scripts - useful tools.
-  * simulations - global configs for simulations: debug mode, power analysis and database recording. Some specific configuration files are referenced in the global configuration file.
-  * traces - trace files for simulations. They contain accesses to memory in certain known scenarios.
+- **resources**
+  - **configs**: XML files used for configure specific details of the simulation.
+    - am_configs: address mapping configuration
+    - memconfigs: memory configuration
+    - memspecs: configuration related to the memory technology
+    - simconfigs: simulator configuration
+  - **scripts**: useful tools like address scrambler, trace analyser, database
+    creator, etc.
+  - **simulations**: global configuration
+  - **traces**: trace files for simulations. They contain accesses to memory
+    in certain known scenarios.
 

From fd371795c7ab0658b206462fa0956a77dedf903a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Wed, 6 May 2015 11:33:58 +0200
Subject: [PATCH 2/9] Using relative paths instead of absolute paths in
 configuration files

---
 dram/resources/configs/memconfigs/fifo.xml       | 3 ++-
 dram/resources/configs/memconfigs/fifoStrict.xml | 2 +-
 dram/resources/configs/memconfigs/fr_fcfs.xml    | 2 +-
 dram/resources/simulations/sim-batch.xml         | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dram/resources/configs/memconfigs/fifo.xml b/dram/resources/configs/memconfigs/fifo.xml
index 094a261e..c37033bb 100644
--- a/dram/resources/configs/memconfigs/fifo.xml
+++ b/dram/resources/configs/memconfigs/fifo.xml
@@ -8,6 +8,7 @@
   <PowerDownTimeout value="100" />
   <!-- Error Modelling -->
   <Chipseed value="42" />
-  <csvfile value="/home/ehses/projects/dram.vp.system/dram/src/error/error_new.csv" />
+  <csvfile value="../src/error/error_new.csv" />
+
   <StorMo value="0" /><!--3 Modes: 0 no storage, 1 store data without errormodel, 2 store data with errormodel-->
 </memconfig>
diff --git a/dram/resources/configs/memconfigs/fifoStrict.xml b/dram/resources/configs/memconfigs/fifoStrict.xml
index 64424430..36f48e64 100644
--- a/dram/resources/configs/memconfigs/fifoStrict.xml
+++ b/dram/resources/configs/memconfigs/fifoStrict.xml
@@ -8,6 +8,6 @@
   <PowerDownTimeout value="100" />
   <!-- Error Modelling -->
   <Chipseed value="42" />
-  <csvfile value="/home/ehses/projects/dram.vp.system/dram/src/error/error_new.csv" />
+  <csvfile value="../src/error/error_new.csv" />
   <StorMo value="0" /><!--3 Modes: 0 no storage, 1 store data without errormodel, 2 store data with errormodel-->
 </memconfig>
diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/dram/resources/configs/memconfigs/fr_fcfs.xml
index 546b3223..b5022068 100644
--- a/dram/resources/configs/memconfigs/fr_fcfs.xml
+++ b/dram/resources/configs/memconfigs/fr_fcfs.xml
@@ -8,7 +8,7 @@
   <PowerDownTimeout value="100" />
   <!-- Error Model: -->
   <Chipseed value="42" />
-  <csvfile value="/home/ehses/projects/dram.vp.system/dram/src/error/error_new.csv" />
+  <csvfile value="../src/error/error_new.csv" />
   <StorMo value="0" /><!--3 Modes: 0 no storage, 1 store data without errormodel, 2 store data with errormodel-->
   <!-- 
   <Buswidth value="128" />
diff --git a/dram/resources/simulations/sim-batch.xml b/dram/resources/simulations/sim-batch.xml
index 5cfb81b9..bf579499 100644
--- a/dram/resources/simulations/sim-batch.xml
+++ b/dram/resources/simulations/sim-batch.xml
@@ -31,13 +31,13 @@
                     <PowerAnalysys value="1" />
         </simconfig>
         <memspecs>
-                <memspec src="/home/jungma/projects/dram.vp.system/dram/resources/configs/memspecs/WideIO.xml"></memspec>
+                <memspec src="../resources/configs/memspecs/WideIO.xml"></memspec>
         </memspecs>
         <addressmappings>
-                <addressmapping src="/home/jungma/projects/dram.vp.system/dram/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
+                <addressmapping src="../resources/configs/amconfigs/am_wideio.xml"></addressmapping>
         </addressmappings>
         <memconfigs>
-           <memconfig src="/home/jungma/projects/dram.vp.system/dram/resources/configs/memconfigs/fifo.xml"/>
+           <memconfig src="../resources/configs/memconfigs/fifo.xml"/>
         </memconfigs>
 
 <tracesetups>

From cd8aeebe6fdd9bca9daf51d8814fd6ee1872b872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Fri, 8 May 2015 12:52:49 +0200
Subject: [PATCH 3/9] Created an enumeration to the possible values of storage
 mode.

---
 dram/resources/configs/memconfigs/fifo.xml    |  2 +-
 .../configs/memconfigs/fifoStrict.xml         |  2 +-
 dram/resources/configs/memconfigs/fr_fcfs.xml |  2 +-
 .../core/configuration/Configuration.cpp      | 16 +++++++++-
 .../core/configuration/Configuration.h        |  4 +--
 dram/src/simulation/Dram.h                    | 29 +++++++++----------
 6 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/dram/resources/configs/memconfigs/fifo.xml b/dram/resources/configs/memconfigs/fifo.xml
index c37033bb..97064ad2 100644
--- a/dram/resources/configs/memconfigs/fifo.xml
+++ b/dram/resources/configs/memconfigs/fifo.xml
@@ -10,5 +10,5 @@
   <Chipseed value="42" />
   <csvfile value="../src/error/error_new.csv" />
 
-  <StorMo value="0" /><!--3 Modes: 0 no storage, 1 store data without errormodel, 2 store data with errormodel-->
+  <StorMo value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
 </memconfig>
diff --git a/dram/resources/configs/memconfigs/fifoStrict.xml b/dram/resources/configs/memconfigs/fifoStrict.xml
index 36f48e64..2bb773c9 100644
--- a/dram/resources/configs/memconfigs/fifoStrict.xml
+++ b/dram/resources/configs/memconfigs/fifoStrict.xml
@@ -9,5 +9,5 @@
   <!-- Error Modelling -->
   <Chipseed value="42" />
   <csvfile value="../src/error/error_new.csv" />
-  <StorMo value="0" /><!--3 Modes: 0 no storage, 1 store data without errormodel, 2 store data with errormodel-->
+  <StorMo value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
 </memconfig>
diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/dram/resources/configs/memconfigs/fr_fcfs.xml
index b5022068..de65253a 100644
--- a/dram/resources/configs/memconfigs/fr_fcfs.xml
+++ b/dram/resources/configs/memconfigs/fr_fcfs.xml
@@ -9,7 +9,7 @@
   <!-- Error Model: -->
   <Chipseed value="42" />
   <csvfile value="../src/error/error_new.csv" />
-  <StorMo value="0" /><!--3 Modes: 0 no storage, 1 store data without errormodel, 2 store data with errormodel-->
+  <StorMo value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
   <!-- 
   <Buswidth value="128" />
   <ReadWriteGrouping value="false" />
diff --git a/dram/src/controller/core/configuration/Configuration.cpp b/dram/src/controller/core/configuration/Configuration.cpp
index d073900c..43fa04fa 100644
--- a/dram/src/controller/core/configuration/Configuration.cpp
+++ b/dram/src/controller/core/configuration/Configuration.cpp
@@ -57,6 +57,20 @@ EPowerDownMode string2PDNMode(string s)
     }
 }
 
+StorageMode string2StorageMode(string s)
+{
+    if (s == "NoStorage")
+            return StorageMode::NoStorage;
+    else if (s == "Store")
+            return StorageMode::Store;
+    else if (s == "ErrorModel")
+            return StorageMode::ErrorModel;
+    else
+    {
+        SC_REPORT_FATAL("Configuration", ("Unknown StorageMode: " + s).c_str());
+        throw;
+    }
+}
 
 void Configuration::setParameter(std::string name, std::string value)
 {
@@ -99,7 +113,7 @@ void Configuration::setParameter(std::string name, std::string value)
     else if(name == "csvfile")
         csvfile = value;
     else if(name == "StorMo")
-        StorMode = string2int(value);
+        StorMode = string2StorageMode(value);
     else
     {
         SC_REPORT_FATAL("Configuration", ("Parameter " + name + " not defined in Configuration").c_str());
diff --git a/dram/src/controller/core/configuration/Configuration.h b/dram/src/controller/core/configuration/Configuration.h
index 3a5b15d4..b50cd749 100644
--- a/dram/src/controller/core/configuration/Configuration.h
+++ b/dram/src/controller/core/configuration/Configuration.h
@@ -13,7 +13,7 @@
 #include "MemSpec.h"
 
 enum class EPowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF};
-
+enum class StorageMode{NoStorage, Store, ErrorModel};
 
 struct Configuration
 {
@@ -54,7 +54,7 @@ struct Configuration
     //Configs for Seed, csv file and StorageMode
     unsigned int Chipseed;
     std::string csvfile ="not defined.";
-    unsigned int StorMode;
+    StorageMode StorMode;
 
 private:
     Configuration();
diff --git a/dram/src/simulation/Dram.h b/dram/src/simulation/Dram.h
index 79e1aa5d..85f7f07c 100644
--- a/dram/src/simulation/Dram.h
+++ b/dram/src/simulation/Dram.h
@@ -50,10 +50,9 @@ struct Dram: sc_module
     tlm_utils::simple_target_socket<Dram, BUSWIDTH, tlm::tlm_base_protocol_types> tSocket;
     IFPOW(libDRAMPower *DRAMPower);
 
-    const unsigned int StorageMode = Configuration::getInstance().StorMode;    // 0 no storage,    1 store,    2 error model
+    StorageMode StorMode = Configuration::getInstance().StorMode;
 
     flip_memory * fmemory; 
-    //Configuration::getInstance().memSpec.NumberOfBanks];
     map< unsigned long int, unsigned char[BUSWIDTH/2] > memory;
 
     SC_CTOR(Dram) : tSocket("socket")
@@ -62,9 +61,9 @@ struct Dram: sc_module
 
         IFPOW( MemorySpecification memSpec(MemSpecParser::getMemSpecFromXML(Configuration::getInstance().memspecUri)) );
         IFPOW( DRAMPower = new libDRAMPower( memSpec, 0 ) );
-        cout << "StorageMode = " << StorageMode << endl;
+        //cout << "StorageMode = " << StorMode << endl;
 
-        if(StorageMode == 2) 
+        if(StorMode == StorageMode::ErrorModel)
         {
             fmemory = new flip_memory[Configuration::getInstance().memSpec.NumberOfBanks];
         }
@@ -76,7 +75,7 @@ struct Dram: sc_module
         IFPOW( DRAMPower->calcEnergy() );
         IFPOW( cout << endl << endl << "Total Energy" << "\t" << DRAMPower->getEnergy().total_energy << endl);
         IFPOW( cout << "Average Power" << "\t" << DRAMPower->getPower().average_power << endl );
-        if(StorageMode == 2)
+        if(StorMode == StorageMode::ErrorModel)
         {
             for(int b = 0; b < 8; b++)
             {
@@ -112,7 +111,7 @@ struct Dram: sc_module
             sendToController(payload, END_ACT, delay +  getExecutionTime(Command::Activate, payload));
             unsigned int row = DramExtension::getExtension(payload).getRow().ID();
 
-            if (StorageMode == 2)
+            if (StorMode == StorageMode::ErrorModel)
             {
                 fmemory[bank].refresh(row);
             }
@@ -122,11 +121,11 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::WR, bank, cycle));
 
             //save data:
-            if (StorageMode == 0)
+            if (StorMode == StorageMode::NoStorage)
             {
                 // Don't store data
             }
-            else if (StorageMode == 1) // Use Storage
+            else if (StorMode == StorageMode::Store) // Use Storage
             {
                 memcpy(&memory[payload.get_address()], payload.get_data_ptr(), BUSWIDTH/8);
             }
@@ -141,7 +140,7 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::RD, bank, cycle));
 
             // Load data:
-            if (StorageMode == 1)    //use StorageMode
+            if (StorMode == StorageMode::Store)    //use StorageMode
             {
                 if(memory.count(payload.get_address()) == 1)
                 {
@@ -152,7 +151,7 @@ struct Dram: sc_module
                     //SC_REPORT_WARNING ("DRAM", "Reading from an empty memory location.");
                 }
             }
-            else if(StorageMode == 2)// use StorageMode with errormodel
+            else if(StorMode == StorageMode::ErrorModel)// use StorageMode with errormodel
             {
                 fmemory[bank].load(payload);
             }
@@ -164,11 +163,11 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::WRA, bank, cycle));
 
             //save data:
-            if (StorageMode == 0)
+            if (StorMode == StorageMode::NoStorage)
             {
                 // Don't store data
             }
-            else if (StorageMode == 1) // Use Storage
+            else if (StorMode == StorageMode::Store) // Use Storage
             {
                 memcpy(&memory[payload.get_address()], payload.get_data_ptr(), BUSWIDTH/8);
             }
@@ -183,7 +182,7 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::RDA, bank, cycle));
 
             // Load data:
-            if (StorageMode == 1)    //use StorageMode
+            if (StorMode == StorageMode::Store)    //use StorageMode
             {
                 if(memory.count(payload.get_address()) == 1)
                 {
@@ -194,7 +193,7 @@ struct Dram: sc_module
                     //SC_REPORT_WARNING ("DRAM", "Reading from an empty memory location.");
                 }
             }
-            else if(StorageMode == 2)// use StorageMode with errormodel
+            else if(StorMode == StorageMode::ErrorModel)// use StorageMode with errormodel
             {
                 fmemory[bank].load(payload);
             }
@@ -207,7 +206,7 @@ struct Dram: sc_module
             sendToController(payload, END_REFA, delay +  getExecutionTime(Command::AutoRefresh, payload));
             unsigned int row = DramExtension::getExtension(payload).getRow().ID();
 
-            if (StorageMode == 2)
+            if (StorMode == StorageMode::ErrorModel)
             {
                 fmemory[bank].refresh(row);
             }

From 19d682c0ca1f9adf3f82553b2503d3c04e36bb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Fri, 8 May 2015 14:04:59 +0200
Subject: [PATCH 4/9] Typo fixed (PowerAnalysys --> PowerAnalysis)

---
 dram/src/controller/core/configuration/Configuration.cpp | 4 ++--
 dram/src/controller/core/configuration/Configuration.h   | 2 +-
 dram/src/simulation/Dram.h                               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dram/src/controller/core/configuration/Configuration.cpp b/dram/src/controller/core/configuration/Configuration.cpp
index 43fa04fa..5d8449ff 100644
--- a/dram/src/controller/core/configuration/Configuration.cpp
+++ b/dram/src/controller/core/configuration/Configuration.cpp
@@ -103,8 +103,8 @@ void Configuration::setParameter(std::string name, std::string value)
     //SimConfig------------------------------------------------
     else if(name == "DatabaseRecording")
         DatabaseRecording = string2bool(value);
-    else if(name == "PowerAnalysys")
-        PowerAnalysys = string2bool(value);
+    else if(name == "PowerAnalysis")
+        PowerAnalysis = string2bool(value);
     else if(name == "Debug")
         Debug = string2bool(value);
     //Specification for Chipseed, csvfile path and StorageMode
diff --git a/dram/src/controller/core/configuration/Configuration.h b/dram/src/controller/core/configuration/Configuration.h
index b50cd749..552c212b 100644
--- a/dram/src/controller/core/configuration/Configuration.h
+++ b/dram/src/controller/core/configuration/Configuration.h
@@ -42,7 +42,7 @@ struct Configuration
 
     //SimConfig
     bool DatabaseRecording = true;
-    bool PowerAnalysys = false;
+    bool PowerAnalysis = false;
     bool Debug = false;
 
     //MemSpec(from DRAM-Power XML)
diff --git a/dram/src/simulation/Dram.h b/dram/src/simulation/Dram.h
index 85f7f07c..d7497472 100644
--- a/dram/src/simulation/Dram.h
+++ b/dram/src/simulation/Dram.h
@@ -32,7 +32,7 @@ using namespace Data;
 
 //#define POWER
 //not better to define in simulation xml? also flag for storage simulation
-//configuration->PowerAnalysys
+//configuration->PowerAnalysis
 //configuration->ModelStorage
 //configuration->ModelErrotInjection
 

From b3c5bf12b0ec3f909db54dc87fcfc089ec501e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Fri, 8 May 2015 14:18:50 +0200
Subject: [PATCH 5/9] Directory dram-power-original removed from repository.

Its content was a duplicate of "dram.vp.system/dram/src/common/third_party/DRAMPower/memspecs".
---
 .../JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml     | 67 -------------------
 .../JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml     | 67 -------------------
 .../memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml | 55 ---------------
 .../memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml  | 55 ---------------
 .../memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml | 55 ---------------
 .../MICRON_1Gb_DDR3-1066_16bit_G_2s.xml       | 55 ---------------
 .../MICRON_1Gb_DDR3-1066_16bit_G_3s.xml       | 55 ---------------
 .../MICRON_1Gb_DDR3-1066_16bit_G_mu.xml       | 55 ---------------
 .../memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml  | 55 ---------------
 .../MICRON_1Gb_DDR3-1066_8bit_G_2s.xml        | 55 ---------------
 .../MICRON_1Gb_DDR3-1066_8bit_G_3s.xml        | 55 ---------------
 .../MICRON_1Gb_DDR3-1066_8bit_G_mu.xml        | 55 ---------------
 .../memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml  | 55 ---------------
 .../MICRON_1Gb_DDR3-1600_8bit_G_2s.xml        | 55 ---------------
 .../MICRON_1Gb_DDR3-1600_8bit_G_3s.xml        | 55 ---------------
 .../MICRON_1Gb_DDR3-1600_8bit_G_mu.xml        | 55 ---------------
 .../MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml   | 55 ---------------
 .../MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml    | 55 ---------------
 .../MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml   | 55 ---------------
 .../MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml    | 55 ---------------
 .../memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml  | 55 ---------------
 .../MICRON_2Gb_DDR3-1066_8bit_D_2s.xml        | 55 ---------------
 .../MICRON_2Gb_DDR3-1066_8bit_D_3s.xml        | 55 ---------------
 .../MICRON_2Gb_DDR3-1066_8bit_D_mu.xml        | 55 ---------------
 .../memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml | 55 ---------------
 .../MICRON_2Gb_DDR3-1600_16bit_D_2s.xml       | 55 ---------------
 .../MICRON_2Gb_DDR3-1600_16bit_D_3s.xml       | 55 ---------------
 .../MICRON_2Gb_DDR3-1600_16bit_D_mu.xml       | 55 ---------------
 .../memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml | 54 ---------------
 .../memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml | 54 ---------------
 .../MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml     | 67 -------------------
 .../MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml      | 67 -------------------
 .../memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml  | 62 -----------------
 .../memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml  | 62 -----------------
 .../MICRON_4Gb_LPDDR3-1333_32bit_A.xml        | 67 -------------------
 .../MICRON_4Gb_LPDDR3-1600_32bit_A.xml        | 67 -------------------
 .../dram-power-original/memspecs/memspec.dtd  | 13 ----
 37 files changed, 2077 deletions(-)
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml
 delete mode 100644 dram/resources/configs/memspecs/dram-power-original/memspecs/memspec.dtd

diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml
deleted file mode 100644
index 0832dc3e..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-200_128bit.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="JEDEC_256Mb_WIDEIO_SDR-200_128bit" />
-  <parameter id="memoryType" type="string" value="WIDEIO_SDR" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="128" />
-    <parameter id="nbrOfBanks" type="uint" value="4" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="128" />
-    <parameter id="nbrOfRows" type="uint" value="2048" />
-    <parameter id="dataRate" type="uint" value="1" />
-    <parameter id="burstLength" type="uint" value="4" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="200" />
-      <parameter id="RC" type="uint" value="12" />
-      <parameter id="RCD" type="uint" value="4" />
-      <parameter id="RL" type="uint" value="3" />
-      <parameter id="RP" type="uint" value="4" />
-      <parameter id="RFC" type="uint" value="18" />
-      <parameter id="RAS" type="uint" value="9" />
-      <parameter id="WL" type="uint" value="1" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="1" />      
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="3" />
-      <parameter id="XP" type="uint" value="2" />
-      <parameter id="XPDLL" type="uint" value="2" />
-      <parameter id="XS" type="uint" value="20" />
-      <parameter id="XSDLL" type="uint" value="20" />
-      <parameter id="REFI" type="uint" value="3120" />
-      <parameter id="CL" type="uint" value="3" />
-      <parameter id="TAW" type="uint" value="10" />
-      <parameter id="RRD" type="uint" value="2" />
-      <parameter id="CCD" type="uint" value="1" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="3" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="5.88" />
-      <parameter id="idd02" type="double" value="21.18" />
-      <parameter id="idd2p0" type="double" value="0.05" />
-      <parameter id="idd2p02" type="double" value="0.17" />
-      <parameter id="idd2p1" type="double" value="0.05" />
-      <parameter id="idd2p12" type="double" value="0.17" />
-      <parameter id="idd2n" type="double" value="0.13" />
-      <parameter id="idd2n2" type="double" value="4.04" />
-      <parameter id="idd3p0" type="double" value="0.25" />
-      <parameter id="idd3p02" type="double" value="1.49" />
-      <parameter id="idd3p1" type="double" value="0.25" />
-      <parameter id="idd3p12" type="double" value="1.49" />
-      <parameter id="idd3n" type="double" value="0.52" />
-      <parameter id="idd3n2" type="double" value="6.55" />
-      <parameter id="idd4r" type="double" value="1.41" />
-      <parameter id="idd4r2" type="double" value="85.73" />
-      <parameter id="idd4w" type="double" value="1.42" />
-      <parameter id="idd4w2" type="double" value="60.79" />
-      <parameter id="idd5" type="double" value="14.43" />
-      <parameter id="idd52" type="double" value="48.17" />
-      <parameter id="idd6" type="double" value="0.07" />
-      <parameter id="idd62" type="double" value="0.27" />
-      <parameter id="vdd" type="double" value="1.8" />
-      <parameter id="vdd2" type="double" value="1.2" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml
deleted file mode 100644
index 5c416e0d..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/JEDEC_256Mb_WIDEIO_SDR-266_128bit.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="JEDEC_256Mb_WIDEIO_SDR-266_128bit" />
-  <parameter id="memoryType" type="string" value="WIDEIO_SDR" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="128" />
-    <parameter id="nbrOfBanks" type="uint" value="4" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="128" />
-    <parameter id="nbrOfRows" type="uint" value="2048" />
-    <parameter id="dataRate" type="uint" value="1" />
-    <parameter id="burstLength" type="uint" value="4" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="266" />
-      <parameter id="RC" type="uint" value="16" />
-      <parameter id="RCD" type="uint" value="5" />
-      <parameter id="RL" type="uint" value="3" />
-      <parameter id="RP" type="uint" value="5" />
-      <parameter id="RFC" type="uint" value="24" />
-      <parameter id="RAS" type="uint" value="12" />
-      <parameter id="WL" type="uint" value="1" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="1" />      
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="4" />
-      <parameter id="XP" type="uint" value="3" />
-      <parameter id="XPDLL" type="uint" value="3" />
-      <parameter id="XS" type="uint" value="27" />
-      <parameter id="XSDLL" type="uint" value="27" />
-      <parameter id="REFI" type="uint" value="3120" />
-      <parameter id="CL" type="uint" value="3" />
-      <parameter id="TAW" type="uint" value="14" />
-      <parameter id="RRD" type="uint" value="3" />
-      <parameter id="CCD" type="uint" value="1" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="6" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="6.06" />
-      <parameter id="idd02" type="double" value="21.82" />
-      <parameter id="idd2p0" type="double" value="0.05" />
-      <parameter id="idd2p02" type="double" value="0.17" />
-      <parameter id="idd2p1" type="double" value="0.05" />
-      <parameter id="idd2p12" type="double" value="0.17" />
-      <parameter id="idd2n" type="double" value="0.16" />
-      <parameter id="idd2n2" type="double" value="4.76" />
-      <parameter id="idd3p0" type="double" value="0.25" />
-      <parameter id="idd3p02" type="double" value="1.49" />
-      <parameter id="idd3p1" type="double" value="0.25" />
-      <parameter id="idd3p12" type="double" value="1.49" />
-      <parameter id="idd3n" type="double" value="0.58" />
-      <parameter id="idd3n2" type="double" value="7.24" />
-      <parameter id="idd4r" type="double" value="1.82" />
-      <parameter id="idd4r2" type="double" value="111.22" />
-      <parameter id="idd4w" type="double" value="1.82" />
-      <parameter id="idd4w2" type="double" value="78.0" />
-      <parameter id="idd5" type="double" value="14.48" />
-      <parameter id="idd52" type="double" value="48.34" />
-      <parameter id="idd6" type="double" value="0.07" />
-      <parameter id="idd62" type="double" value="0.27" />
-      <parameter id="vdd" type="double" value="1.8" />
-      <parameter id="vdd2" type="double" value="1.2" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml
deleted file mode 100644
index 1a58dbd7..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-1066_16bit_H.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR2-1066_16bit_H" />
-  <parameter id="memoryType" type="string" value="DDR2" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="8192" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="REFI" type="uint" value="3120" />
-      <parameter id="RFC" type="uint" value="68" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="24" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="2" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-      <parameter id="RC" type="uint" value="31" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RAS" type="uint" value="24" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="3" />
-      <parameter id="XPDLL" type="uint" value="10" />
-      <parameter id="XS" type="uint" value="74" />
-      <parameter id="XSDLL" type="uint" value="200" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="90.0" />
-      <parameter id="idd2p0" type="double" value="7.0" />
-      <parameter id="idd2p1" type="double" value="7.0" />
-      <parameter id="idd2n" type="double" value="36.0" />
-      <parameter id="idd3p0" type="double" value="10.0" />
-      <parameter id="idd3p1" type="double" value="23.0" />
-      <parameter id="idd3n" type="double" value="42.0" />
-      <parameter id="idd4w" type="double" value="185.0" />
-      <parameter id="idd4r" type="double" value="180.0" />
-      <parameter id="idd5" type="double" value="160.0" />
-      <parameter id="idd6" type="double" value="7.0" />
-      <parameter id="vdd" type="double" value="1.8" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml
deleted file mode 100644
index a5ba9cc3..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR2-800_16bit_H.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR2-800_16bit_H" />
-  <parameter id="memoryType" type="string" value="DDR2" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="8192" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="400" />
-      <parameter id="REFI" type="uint" value="3120" />
-      <parameter id="RFC" type="uint" value="51" />
-      <parameter id="CL" type="uint" value="5" />
-      <parameter id="FAW" type="uint" value="18" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="2" />
-      <parameter id="WTR" type="uint" value="3" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-      <parameter id="RC" type="uint" value="23" />
-      <parameter id="RCD" type="uint" value="5" />
-      <parameter id="RL" type="uint" value="5" />
-      <parameter id="RP" type="uint" value="5" />
-      <parameter id="RAS" type="uint" value="16" />
-      <parameter id="WL" type="uint" value="4" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="3" />
-      <parameter id="WR" type="uint" value="6" />
-      <parameter id="XP" type="uint" value="2" />
-      <parameter id="XPDLL" type="uint" value="8" />
-      <parameter id="XS" type="uint" value="55" />
-      <parameter id="XSDLL" type="uint" value="200" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="80.0" />
-      <parameter id="idd2p0" type="double" value="7.0" />
-      <parameter id="idd2p1" type="double" value="7.0" />
-      <parameter id="idd2n" type="double" value="30.0" />
-      <parameter id="idd3p0" type="double" value="10.0" />
-      <parameter id="idd3p1" type="double" value="20.0" />
-      <parameter id="idd3n" type="double" value="35.0" />
-      <parameter id="idd4r" type="double" value="150.0" />
-      <parameter id="idd4w" type="double" value="160.0" />
-      <parameter id="idd5" type="double" value="150.0" />
-      <parameter id="idd6" type="double" value="7.0" />
-      <parameter id="vdd" type="double" value="1.8" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml
deleted file mode 100644
index bbf85fda..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_16bit_G" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="8192" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="27" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="75.0" />
-      <parameter id="idd2p0" type="double" value="12.0" />
-      <parameter id="idd2p1" type="double" value="25.0" />
-      <parameter id="idd2n" type="double" value="35.0" />
-      <parameter id="idd3p0" type="double" value="30.0" />
-      <parameter id="idd3p1" type="double" value="30.0" />
-      <parameter id="idd3n" type="double" value="45.0" />
-      <parameter id="idd4w" type="double" value="155.0" />
-      <parameter id="idd4r" type="double" value="140.0" />
-      <parameter id="idd5" type="double" value="160.0" />
-      <parameter id="idd6" type="double" value="8.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml
deleted file mode 100644
index 0fd307ee..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_2s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_16bit_G_2s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="8192" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="27" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="70.22" />
-      <parameter id="idd2p0" type="double" value="9.07" />
-      <parameter id="idd2p1" type="double" value="18.90" />
-      <parameter id="idd2n" type="double" value="30.95" />
-      <parameter id="idd3p0" type="double" value="26.0" />
-      <parameter id="idd3p1" type="double" value="26.0" />
-      <parameter id="idd3n" type="double" value="39.0" />
-      <parameter id="idd4w" type="double" value="144.31" />
-      <parameter id="idd4r" type="double" value="128.59" />
-      <parameter id="idd5" type="double" value="150.64" />
-      <parameter id="idd6" type="double" value="6.02" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml
deleted file mode 100644
index 5d6f85c4..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_3s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_16bit_G_3s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="8192" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="27" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="71.81" />
-      <parameter id="idd2p0" type="double" value="10.04" />
-      <parameter id="idd2p1" type="double" value="20.93" />
-      <parameter id="idd2n" type="double" value="32.3" />
-      <parameter id="idd3p0" type="double" value="27.33" />
-      <parameter id="idd3p1" type="double" value="27.33" />
-      <parameter id="idd3n" type="double" value="41.0" />
-      <parameter id="idd4w" type="double" value="147.87" />
-      <parameter id="idd4r" type="double" value="132.39" />
-      <parameter id="idd5" type="double" value="153.76" />
-      <parameter id="idd6" type="double" value="6.68" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml
deleted file mode 100644
index 18db3b33..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_16bit_G_mu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_16bit_G_mu" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="8192" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="27" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="67.04" />
-      <parameter id="idd2p0" type="double" value="7.12" />
-      <parameter id="idd2p1" type="double" value="14.83" />
-      <parameter id="idd2n" type="double" value="28.25" />
-      <parameter id="idd3p0" type="double" value="23.34" />
-      <parameter id="idd3p1" type="double" value="23.34" />
-      <parameter id="idd3n" type="double" value="35.01" />
-      <parameter id="idd4w" type="double" value="137.19" />
-      <parameter id="idd4r" type="double" value="120.98" />
-      <parameter id="idd5" type="double" value="144.41" />
-      <parameter id="idd6" type="double" value="4.70" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml
deleted file mode 100644
index 8e1ce348..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_8bit_G" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="60.0" />
-      <parameter id="idd2p0" type="double" value="12.0" />
-      <parameter id="idd2p1" type="double" value="25.0" />
-      <parameter id="idd2n" type="double" value="35.0" />
-      <parameter id="idd3p0" type="double" value="30.0" />
-      <parameter id="idd3p1" type="double" value="30.0" />
-      <parameter id="idd3n" type="double" value="40.0" />
-      <parameter id="idd4w" type="double" value="110.0" />
-      <parameter id="idd4r" type="double" value="105.0" />
-      <parameter id="idd5" type="double" value="160.0" />
-      <parameter id="idd6" type="double" value="8.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml
deleted file mode 100644
index ce6d7de0..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_2s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_8bit_G_2s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="56.18" />
-      <parameter id="idd2p0" type="double" value="9.07" />
-      <parameter id="idd2p1" type="double" value="18.9" />
-      <parameter id="idd2n" type="double" value="30.95" />
-      <parameter id="idd3p0" type="double" value="26.0" />
-      <parameter id="idd3p1" type="double" value="26.0" />
-      <parameter id="idd3n" type="double" value="34.67" />
-      <parameter id="idd4w" type="double" value="102.0" />
-      <parameter id="idd4r" type="double" value="96.88" />
-      <parameter id="idd5" type="double" value="150.64" />
-      <parameter id="idd6" type="double" value="6.02" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml
deleted file mode 100644
index 616da5b5..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_3s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_8bit_G_3s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="57.45" />
-      <parameter id="idd2p0" type="double" value="10.04" />
-      <parameter id="idd2p1" type="double" value="20.93" />
-      <parameter id="idd2n" type="double" value="32.3" />
-      <parameter id="idd3p0" type="double" value="27.33" />
-      <parameter id="idd3p1" type="double" value="27.33" />
-      <parameter id="idd3n" type="double" value="36.45" />
-      <parameter id="idd4w" type="double" value="104.67" />
-      <parameter id="idd4r" type="double" value="99.59" />
-      <parameter id="idd5" type="double" value="153.76" />
-      <parameter id="idd6" type="double" value="6.68" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml
deleted file mode 100644
index 018b75b5..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1066_8bit_G_mu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1066_8bit_G_mu" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="53.63" />
-      <parameter id="idd2p0" type="double" value="7.12" />
-      <parameter id="idd2p1" type="double" value="14.83" />
-      <parameter id="idd2n" type="double" value="28.25" />
-      <parameter id="idd3p0" type="double" value="23.34" />
-      <parameter id="idd3p1" type="double" value="23.34" />
-      <parameter id="idd3n" type="double" value="31.12" />
-      <parameter id="idd4w" type="double" value="96.68" />
-      <parameter id="idd4r" type="double" value="91.47" />
-      <parameter id="idd5" type="double" value="144.41" />
-      <parameter id="idd6" type="double" value="4.70" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml
deleted file mode 100644
index 052f6773..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1600_8bit_G" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="88" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="6" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="96" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="6240" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="24" />
-      <parameter id="RRD" type="uint" value="5" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="70.0" />
-      <parameter id="idd2p0" type="double" value="12.0" />
-      <parameter id="idd2p1" type="double" value="30.0" />
-      <parameter id="idd2n" type="double" value="45.0" />
-      <parameter id="idd3p0" type="double" value="35.0" />
-      <parameter id="idd3p1" type="double" value="35.0" />
-      <parameter id="idd3n" type="double" value="45.0" />
-      <parameter id="idd4w" type="double" value="145.0" />
-      <parameter id="idd4r" type="double" value="140.0" />
-      <parameter id="idd5" type="double" value="170.0" />
-      <parameter id="idd6" type="double" value="8.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml
deleted file mode 100644
index be3627c2..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_2s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1600_8bit_G_2s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="88" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="6" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="96" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="6240" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="24" />
-      <parameter id="RRD" type="uint" value="5" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="65.19" />
-      <parameter id="idd2p0" type="double" value="9.07" />
-      <parameter id="idd2p1" type="double" value="22.68" />
-      <parameter id="idd2n" type="double" value="40.0" />
-      <parameter id="idd3p0" type="double" value="31.16" />
-      <parameter id="idd3p1" type="double" value="31.16" />
-      <parameter id="idd3n" type="double" value="40.07" />
-      <parameter id="idd4w" type="double" value="130.17" />
-      <parameter id="idd4r" type="double" value="127.49" />
-      <parameter id="idd5" type="double" value="159.28" />
-      <parameter id="idd6" type="double" value="6.02" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml
deleted file mode 100644
index 2f7e3fc9..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_3s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1600_8bit_G_3s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="88" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="6" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="96" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="6240" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="24" />
-      <parameter id="RRD" type="uint" value="5" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="66.79" />
-      <parameter id="idd2p0" type="double" value="10.04" />
-      <parameter id="idd2p1" type="double" value="25.12" />
-      <parameter id="idd2n" type="double" value="41.67" />
-      <parameter id="idd3p0" type="double" value="32.44" />
-      <parameter id="idd3p1" type="double" value="32.44" />
-      <parameter id="idd3n" type="double" value="41.71" />
-      <parameter id="idd4w" type="double" value="135.11" />
-      <parameter id="idd4r" type="double" value="131.66" />
-      <parameter id="idd5" type="double" value="162.85" />
-      <parameter id="idd6" type="double" value="6.68" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml
deleted file mode 100644
index 14ec62e6..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_1Gb_DDR3-1600_8bit_G_mu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_1Gb_DDR3-1600_8bit_G_mu" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="88" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="6" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="96" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="6240" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="24" />
-      <parameter id="RRD" type="uint" value="5" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="61.99" />
-      <parameter id="idd2p0" type="double" value="7.12" />
-      <parameter id="idd2p1" type="double" value="17.8" />
-      <parameter id="idd2n" type="double" value="36.68" />
-      <parameter id="idd3p0" type="double" value="28.61" />
-      <parameter id="idd3p1" type="double" value="28.61" />
-      <parameter id="idd3n" type="double" value="36.78" />
-      <parameter id="idd4w" type="double" value="120.28" />
-      <parameter id="idd4r" type="double" value="119.16" />
-      <parameter id="idd5" type="double" value="152.13" />
-      <parameter id="idd6" type="double" value="4.7" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml
deleted file mode 100644
index 2545f2c1..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_D_SODIMM.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2GB_DDR3-1066_64bit_D_SODIMM" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="64" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="2" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="720.0" />
-      <parameter id="idd2p0" type="double" value="80.0" />
-      <parameter id="idd2p1" type="double" value="200.0" />
-      <parameter id="idd2n" type="double" value="400.0" />
-      <parameter id="idd3p0" type="double" value="240.0" />
-      <parameter id="idd3p1" type="double" value="240.0" />
-      <parameter id="idd3n" type="double" value="440.0" />
-      <parameter id="idd4w" type="double" value="1200.0" />
-      <parameter id="idd4r" type="double" value="1200.0" />
-      <parameter id="idd5" type="double" value="1760.0" />
-      <parameter id="idd6" type="double" value="48.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml
deleted file mode 100644
index be78c1cb..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1066_64bit_G_UDIMM.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2GB_DDR3-1066_64bit_G_UDIMM" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="64" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="2" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="59" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="64" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="432.0" />
-      <parameter id="idd2p0" type="double" value="108.0" />
-      <parameter id="idd2p1" type="double" value="225.0" />
-      <parameter id="idd2n" type="double" value="315.0" />
-      <parameter id="idd3p0" type="double" value="270.0" />
-      <parameter id="idd3p1" type="double" value="270.0" />
-      <parameter id="idd3n" type="double" value="360.0" />
-      <parameter id="idd4w" type="double" value="837.0" />
-      <parameter id="idd4r" type="double" value="882.0" />
-      <parameter id="idd5" type="double" value="1332.0" />
-      <parameter id="idd6" type="double" value="90.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml
deleted file mode 100644
index 0ed1dd8e..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1333_64bit_D_SODIMM.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2GB_DDR3-1333_64bit_D_SODIMM" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="64" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="2" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="666" />
-      <parameter id="RC" type="uint" value="33" />
-      <parameter id="RCD" type="uint" value="9" />
-      <parameter id="RL" type="uint" value="9" />
-      <parameter id="RP" type="uint" value="9" />
-      <parameter id="RFC" type="uint" value="74" />
-      <parameter id="RAS" type="uint" value="24" />
-      <parameter id="WL" type="uint" value="7" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="5" />
-      <parameter id="WR" type="uint" value="10" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="16" />
-      <parameter id="XS" type="uint" value="80" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="5200" />
-      <parameter id="CL" type="uint" value="9" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="5" />
-      <parameter id="CKE" type="uint" value="4" />
-      <parameter id="CKESR" type="uint" value="5" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="800.0" />
-      <parameter id="idd2p0" type="double" value="80.0" />
-      <parameter id="idd2p1" type="double" value="200.0" />
-      <parameter id="idd2n" type="double" value="440.0" />
-      <parameter id="idd3p0" type="double" value="280.0" />
-      <parameter id="idd3p1" type="double" value="280.0" />
-      <parameter id="idd3n" type="double" value="480.0" />
-      <parameter id="idd4w" type="double" value="1520.0" />
-      <parameter id="idd4r" type="double" value="1440.0" />
-      <parameter id="idd5" type="double" value="1920.0" />
-      <parameter id="idd6" type="double" value="48.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml
deleted file mode 100644
index 3ac0adaa..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2GB_DDR3-1600_64bit_G_UDIMM.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2GB_DDR3-1600_64bit_G_UDIMM" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="64" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="2" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="88" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="5" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="96" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="32" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="5" />
-      <parameter id="CKESR" type="uint" value="5" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="522.0" />
-      <parameter id="idd2p0" type="double" value="108.0" />
-      <parameter id="idd2p1" type="double" value="270.0" />
-      <parameter id="idd2n" type="double" value="405.0" />
-      <parameter id="idd3p0" type="double" value="315.0" />
-      <parameter id="idd3p1" type="double" value="315.0" />
-      <parameter id="idd3n" type="double" value="405.0" />
-      <parameter id="idd4w" type="double" value="1152.0" />
-      <parameter id="idd4r" type="double" value="1197.0" />
-      <parameter id="idd5" type="double" value="1422.0" />
-      <parameter id="idd6" type="double" value="90.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml
deleted file mode 100644
index 1fde2941..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1066_8bit_D" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="32768" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="86" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="92" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="75.0" />
-      <parameter id="idd2p0" type="double" value="12.0" />
-      <parameter id="idd2p1" type="double" value="25.0" />
-      <parameter id="idd2n" type="double" value="32.0" />
-      <parameter id="idd3p0" type="double" value="30.0" />
-      <parameter id="idd3p1" type="double" value="30.0" />
-      <parameter id="idd3n" type="double" value="35.0" />
-      <parameter id="idd4w" type="double" value="145.0" />
-      <parameter id="idd4r" type="double" value="140.0" />
-      <parameter id="idd5" type="double" value="190.0" />
-      <parameter id="idd6" type="double" value="12.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml
deleted file mode 100644
index 4cf932d9..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_2s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1066_8bit_D_2s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="32768" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="86" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="92" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="70.08" />
-      <parameter id="idd2p0" type="double" value="8.78" />
-      <parameter id="idd2p1" type="double" value="18.29" />
-      <parameter id="idd2n" type="double" value="27.52" />
-      <parameter id="idd3p0" type="double" value="26.23" />
-      <parameter id="idd3p1" type="double" value="26.23" />
-      <parameter id="idd3n" type="double" value="30.6" />
-      <parameter id="idd4w" type="double" value="131.42" />
-      <parameter id="idd4r" type="double" value="128.07" />
-      <parameter id="idd5" type="double" value="178.56" />
-      <parameter id="idd6" type="double" value="8.41" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml
deleted file mode 100644
index d5821b24..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_3s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1066_8bit_D_3s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="32768" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="86" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="92" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="71.72" />
-      <parameter id="idd2p0" type="double" value="9.85" />
-      <parameter id="idd2p1" type="double" value="20.53" />
-      <parameter id="idd2n" type="double" value="29.02" />
-      <parameter id="idd3p0" type="double" value="27.48" />
-      <parameter id="idd3p1" type="double" value="27.48" />
-      <parameter id="idd3n" type="double" value="32.06" />
-      <parameter id="idd4w" type="double" value="135.95" />
-      <parameter id="idd4r" type="double" value="132.05" />
-      <parameter id="idd5" type="double" value="182.37" />
-      <parameter id="idd6" type="double" value="9.6" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml
deleted file mode 100644
index 8f60dd9d..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1066_8bit_D_mu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1066_8bit_D_mu" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="32768" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="RC" type="uint" value="27" />
-      <parameter id="RCD" type="uint" value="7" />
-      <parameter id="RL" type="uint" value="7" />
-      <parameter id="RP" type="uint" value="7" />
-      <parameter id="RFC" type="uint" value="86" />
-      <parameter id="RAS" type="uint" value="20" />
-      <parameter id="WL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="8" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="13" />
-      <parameter id="XS" type="uint" value="92" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="7" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="66.8" />
-      <parameter id="idd2p0" type="double" value="6.63" />
-      <parameter id="idd2p1" type="double" value="13.82" />
-      <parameter id="idd2n" type="double" value="24.54" />
-      <parameter id="idd3p0" type="double" value="23.71" />
-      <parameter id="idd3p1" type="double" value="23.71" />
-      <parameter id="idd3n" type="double" value="27.67" />
-      <parameter id="idd4w" type="double" value="122.38" />
-      <parameter id="idd4r" type="double" value="120.13" />
-      <parameter id="idd5" type="double" value="170.93" />
-      <parameter id="idd6" type="double" value="6.01" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml
deleted file mode 100644
index ce8f92cf..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1600_16bit_D" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="128" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="5" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="136" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="32" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="110.0" />
-      <parameter id="idd2p0" type="double" value="12.0" />
-      <parameter id="idd2p1" type="double" value="40.0" />
-      <parameter id="idd2n" type="double" value="42.0" />
-      <parameter id="idd3p0" type="double" value="45.0" />
-      <parameter id="idd3p1" type="double" value="45.0" />
-      <parameter id="idd3n" type="double" value="45.0" />
-      <parameter id="idd4w" type="double" value="280.0" />
-      <parameter id="idd4r" type="double" value="270.0" />
-      <parameter id="idd5" type="double" value="215.0" />
-      <parameter id="idd6" type="double" value="12.0" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml
deleted file mode 100644
index 70093b4b..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_2s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1600_16bit_D_2s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="128" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="5" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="136" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="32" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="102.83" />
-      <parameter id="idd2p0" type="double" value="8.77" />
-      <parameter id="idd2p1" type="double" value="29.25" />
-      <parameter id="idd2n" type="double" value="36.89" />
-      <parameter id="idd3p0" type="double" value="38.75" />
-      <parameter id="idd3p1" type="double" value="38.75" />
-      <parameter id="idd3n" type="double" value="38.75" />
-      <parameter id="idd4w" type="double" value="260.04" />
-      <parameter id="idd4r" type="double" value="247.34" />
-      <parameter id="idd5" type="double" value="202.17" />
-      <parameter id="idd6" type="double" value="8.67" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml
deleted file mode 100644
index a866e7c9..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_3s.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1600_16bit_D_3s" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="128" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="5" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="136" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="32" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="105.25" />
-      <parameter id="idd2p0" type="double" value="9.85" />
-      <parameter id="idd2p1" type="double" value="32.83" />
-      <parameter id="idd2n" type="double" value="38.59" />
-      <parameter id="idd3p0" type="double" value="40.83" />
-      <parameter id="idd3p1" type="double" value="40.83" />
-      <parameter id="idd3n" type="double" value="40.83" />
-      <parameter id="idd4w" type="double" value="266.69" />
-      <parameter id="idd4r" type="double" value="254.89" />
-      <parameter id="idd5" type="double" value="206.44" />
-      <parameter id="idd6" type="double" value="9.78" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml
deleted file mode 100644
index 9cda2f25..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_DDR3-1600_16bit_D_mu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_DDR3-1600_16bit_D_mu" />
-  <parameter id="memoryType" type="string" value="DDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="RC" type="uint" value="38" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RFC" type="uint" value="128" />
-      <parameter id="RAS" type="uint" value="28" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="DQSCK" type="uint" value="0" />
-      <parameter id="RTP" type="uint" value="6" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="XP" type="uint" value="5" />
-      <parameter id="XPDLL" type="uint" value="20" />
-      <parameter id="XS" type="uint" value="136" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="REFI" type="uint" value="4160" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="FAW" type="uint" value="32" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="6" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="4" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="98.06" />
-      <parameter id="idd2p0" type="double" value="6.62" />
-      <parameter id="idd2p1" type="double" value="22.09" />
-      <parameter id="idd2n" type="double" value="33.49" />
-      <parameter id="idd3p0" type="double" value="34.59" />
-      <parameter id="idd3p1" type="double" value="34.59" />
-      <parameter id="idd3n" type="double" value="34.59" />
-      <parameter id="idd4w" type="double" value="246.74" />
-      <parameter id="idd4r" type="double" value="232.24" />
-      <parameter id="idd5" type="double" value="193.62" />
-      <parameter id="idd6" type="double" value="6.45" />
-      <parameter id="vdd" type="double" value="1.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml
deleted file mode 100644
index 657cf37c..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-266_16bit_A.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_LPDDR-266_16bit_A" />
-  <parameter id="memoryType" type="string" value="LPDDR" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="4" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="2048" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="133" />
-      <parameter id="REFI" type="uint" value="2080" />
-      <parameter id="RFC" type="uint" value="10" />
-      <parameter id="RL" type="uint" value="3" />
-      <parameter id="WL" type="uint" value="3" />
-      <parameter id="CL" type="uint" value="3" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="3" />
-      <parameter id="RAS" type="uint" value="6" />
-      <parameter id="RCD" type="uint" value="3" />
-      <parameter id="RC" type="uint" value="9" />
-      <parameter id="RRD" type="uint" value="2" />
-      <parameter id="RTP" type="uint" value="3" />
-      <parameter id="WR" type="uint" value="2" />
-      <parameter id="CCD" type="uint" value="2" />
-      <parameter id="WTR" type="uint" value="1" />
-      <parameter id="DQSCK" type="uint" value="1" />
-      <parameter id="XP" type="uint" value="1" />
-      <parameter id="XPDLL" type="uint" value="1" />
-      <parameter id="XS" type="uint" value="15" />
-      <parameter id="XSDLL" type="uint" value="15" />
-      <parameter id="CKE" type="uint" value="1" />
-      <parameter id="CKESR" type="uint" value="2" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="70.0" />
-      <parameter id="idd2p0" type="double" value="0.6" />
-      <parameter id="idd2p1" type="double" value="0.6" />
-      <parameter id="idd2n" type="double" value="12.0" />
-      <parameter id="idd3p0" type="double" value="3.6" />
-      <parameter id="idd3p1" type="double" value="3.6" />
-      <parameter id="idd3n" type="double" value="16.0" />
-      <parameter id="idd4r" type="double" value="105.0" />
-      <parameter id="idd4w" type="double" value="105.0" />
-      <parameter id="idd5" type="double" value="170.0" />
-      <parameter id="idd6" type="double" value="1.7" />
-      <parameter id="vdd" type="double" value="1.8" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml
deleted file mode 100644
index 5a7d5c7e..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR-333_16bit_A.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_LPDDR-333_16bit_A" />
-  <parameter id="memoryType" type="string" value="LPDDR" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="4" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="2048" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="166" />
-      <parameter id="REFI" type="uint" value="2600" />
-      <parameter id="RFC" type="uint" value="12" />
-      <parameter id="RL" type="uint" value="3" />
-      <parameter id="WL" type="uint" value="3" />
-      <parameter id="CL" type="uint" value="3" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="3" />
-      <parameter id="RAS" type="uint" value="7" />
-      <parameter id="RCD" type="uint" value="3" />
-      <parameter id="RC" type="uint" value="10" />
-      <parameter id="RRD" type="uint" value="2" />
-      <parameter id="RTP" type="uint" value="3" />
-      <parameter id="WR" type="uint" value="3" />
-      <parameter id="CCD" type="uint" value="2" />
-      <parameter id="WTR" type="uint" value="1" />
-      <parameter id="DQSCK" type="uint" value="1" />
-      <parameter id="XP" type="uint" value="1" />
-      <parameter id="XPDLL" type="uint" value="1" />
-      <parameter id="XS" type="uint" value="19" />
-      <parameter id="XSDLL" type="uint" value="19" />
-      <parameter id="CKE" type="uint" value="1" />
-      <parameter id="CKESR" type="uint" value="2" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="100.0" />
-      <parameter id="idd2p0" type="double" value="0.6" />
-      <parameter id="idd2p1" type="double" value="0.6" />
-      <parameter id="idd2n" type="double" value="15.0" />
-      <parameter id="idd3p0" type="double" value="3.6" />
-      <parameter id="idd3p1" type="double" value="3.6" />
-      <parameter id="idd3n" type="double" value="18.0" />
-      <parameter id="idd4r" type="double" value="115.0" />
-      <parameter id="idd4w" type="double" value="115.0" />
-      <parameter id="idd5" type="double" value="170.0" />
-      <parameter id="idd6" type="double" value="1.7" />
-      <parameter id="vdd" type="double" value="1.8" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml
deleted file mode 100644
index 7a4fb08b..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-1066-S4_16bit_A.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_LPDDR2-1066-S4_16bit_A" />
-  <parameter id="memoryType" type="string" value="LPDDR2" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="533" />
-      <parameter id="REFI" type="uint" value="2080" />
-      <parameter id="RFC" type="uint" value="70" />
-      <parameter id="RL" type="uint" value="8" />
-      <parameter id="WL" type="uint" value="4" />
-      <parameter id="CL" type="uint" value="8" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="10" />
-      <parameter id="RAS" type="uint" value="23" />
-      <parameter id="RCD" type="uint" value="10" />
-      <parameter id="RC" type="uint" value="32" />
-      <parameter id="FAW" type="uint" value="27" />
-      <parameter id="RRD" type="uint" value="6" />
-      <parameter id="RTP" type="uint" value="4" />
-      <parameter id="WR" type="uint" value="10" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="4" />
-      <parameter id="DQSCK" type="uint" value="2" />
-      <parameter id="XP" type="uint" value="4" />
-      <parameter id="XPDLL" type="uint" value="4" />
-      <parameter id="XS" type="uint" value="75" />
-      <parameter id="XSDLL" type="uint" value="75" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="8" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="20.0" />
-      <parameter id="idd02" type="double" value="71.0" />
-      <parameter id="idd2p0" type="double" value="0.5" />
-      <parameter id="idd2p02" type="double" value="1.7" />
-      <parameter id="idd2p1" type="double" value="0.5" />
-      <parameter id="idd2p12" type="double" value="1.7" />
-      <parameter id="idd2n" type="double" value="1.7" />
-      <parameter id="idd2n2" type="double" value="22.0" />
-      <parameter id="idd3p0" type="double" value="1.2" />
-      <parameter id="idd3p02" type="double" value="4.12" />
-      <parameter id="idd3p1" type="double" value="1.2" />
-      <parameter id="idd3p12" type="double" value="4.12" />
-      <parameter id="idd3n" type="double" value="1.2" />
-      <parameter id="idd3n2" type="double" value="30.0" />
-      <parameter id="idd4r" type="double" value="5.0" />
-      <parameter id="idd4r2" type="double" value="226.0" />
-      <parameter id="idd4w" type="double" value="10.0" />
-      <parameter id="idd4w2" type="double" value="208.0" />
-      <parameter id="idd5" type="double" value="15.0" />
-      <parameter id="idd52" type="double" value="136.0" />
-      <parameter id="idd6" type="double" value="1.2" />
-      <parameter id="idd62" type="double" value="2.6" />
-      <parameter id="vdd" type="double" value="1.8" />
-      <parameter id="vdd2" type="double" value="1.2" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml
deleted file mode 100644
index fc5a9da1..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_2Gb_LPDDR2-800-S4_16bit_A.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_2Gb_LPDDR2-800-S4_16bit_A" />
-  <parameter id="memoryType" type="string" value="LPDDR2" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="16" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="400" />
-      <parameter id="REFI" type="uint" value="1560" />      
-      <parameter id="RFC" type="uint" value="52" />
-      <parameter id="RL" type="uint" value="6" />
-      <parameter id="WL" type="uint" value="3" />
-      <parameter id="CL" type="uint" value="6" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="8" />
-      <parameter id="RAS" type="uint" value="17" />
-      <parameter id="RCD" type="uint" value="8" />
-      <parameter id="RC" type="uint" value="24" />
-      <parameter id="FAW" type="uint" value="20" />
-      <parameter id="RRD" type="uint" value="4" />
-      <parameter id="RTP" type="uint" value="3" />
-      <parameter id="WR" type="uint" value="6" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="3" />
-      <parameter id="DQSCK" type="uint" value="1" />
-      <parameter id="XP" type="uint" value="3" />
-      <parameter id="XPDLL" type="uint" value="3" />
-      <parameter id="XS" type="uint" value="56" />
-      <parameter id="XSDLL" type="uint" value="56" />
-      <parameter id="CKE" type="uint" value="3" />
-      <parameter id="CKESR" type="uint" value="6" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="20.0" />
-      <parameter id="idd02" type="double" value="56.0" />
-      <parameter id="idd2p0" type="double" value="0.5" />
-      <parameter id="idd2p02" type="double" value="1.7" />
-      <parameter id="idd2p1" type="double" value="0.5" />
-      <parameter id="idd2p12" type="double" value="1.7" />
-      <parameter id="idd2n" type="double" value="1.7" />
-      <parameter id="idd2n2" type="double" value="21.0" />
-      <parameter id="idd3p0" type="double" value="1.2" />
-      <parameter id="idd3p02" type="double" value="4.12" />
-      <parameter id="idd3p1" type="double" value="1.2" />
-      <parameter id="idd3p12" type="double" value="4.12" />
-      <parameter id="idd3n" type="double" value="1.2" />
-      <parameter id="idd3n2" type="double" value="29.0" />
-      <parameter id="idd4r" type="double" value="5.0" />
-      <parameter id="idd4r2" type="double" value="216.0" />
-      <parameter id="idd4w" type="double" value="10.0" />
-      <parameter id="idd4w2" type="double" value="203.0" />
-      <parameter id="idd5" type="double" value="15.0" />
-      <parameter id="idd52" type="double" value="136.0" />
-      <parameter id="idd6" type="double" value="1.2" />
-      <parameter id="idd62" type="double" value="2.6" />
-      <parameter id="vdd" type="double" value="1.8" />
-      <parameter id="vdd2" type="double" value="1.2" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml
deleted file mode 100644
index 857a5113..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-1866_8bit_A.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_4Gb_DDR4-1866_8bit_A" />
-  <parameter id="memoryType" type="string" value="DDR4" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBankGroups" type="uint" value="4" />
-    <parameter id="nbrOfBanks" type="uint" value="16" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="32768" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="933" />
-      <parameter id="REFI" type="uint" value="3644" />
-      <parameter id="RFC" type="uint" value="243" />
-      <parameter id="RL" type="uint" value="13" />
-      <parameter id="WL" type="uint" value="12" />
-      <parameter id="CL" type="uint" value="13" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="13" />
-      <parameter id="RAS" type="uint" value="32" />
-      <parameter id="RCD" type="uint" value="13" />
-      <parameter id="RC" type="uint" value="45" />
-      <parameter id="FAW" type="uint" value="22" />
-      <parameter id="RTP" type="uint" value="8" />
-      <parameter id="WR" type="uint" value="14" />
-      <parameter id="RRD_S" type="uint" value="4" />
-      <parameter id="RRD_L" type="uint" value="5" />
-      <parameter id="CCD_S" type="uint" value="4" />
-      <parameter id="CCD_L" type="uint" value="5" />
-      <parameter id="WTR_S" type="uint" value="3" />
-      <parameter id="WTR_L" type="uint" value="7" />
-      <parameter id="DQSCK" type="uint" value="2" />
-      <parameter id="XP" type="uint" value="8" />
-      <parameter id="XPDLL" type="uint" value="255" />
-      <parameter id="XS" type="uint" value="252" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="CKE" type="uint" value="6" />
-      <parameter id="CKESR" type="uint" value="7" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="56.25" />
-      <parameter id="idd02" type="double" value="4.05" />
-      <parameter id="idd2p0" type="double" value="17.0" />
-      <parameter id="idd2p1" type="double" value="17.0" />
-      <parameter id="idd2n" type="double" value="33.75" />
-      <parameter id="idd3p0" type="double" value="22.5" />
-      <parameter id="idd3p1" type="double" value="22.5" />
-      <parameter id="idd3n" type="double" value="39.5" />
-      <parameter id="idd4r" type="double" value="157.5" />
-      <parameter id="idd4w" type="double" value="135.0" />
-      <parameter id="idd5" type="double" value="118.0" />
-      <parameter id="idd6" type="double" value="20.25" />
-      <parameter id="idd62" type="double" value="2.6" />
-      <parameter id="vdd" type="double" value="1.2" />
-      <parameter id="vdd2" type="double" value="2.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml
deleted file mode 100644
index 1eabf24f..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_DDR4-2400_8bit_A.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_4Gb_DDR4-2400_8bit_A" />
-  <parameter id="memoryType" type="string" value="DDR4" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="8" />
-    <parameter id="nbrOfBankGroups" type="uint" value="4" />
-    <parameter id="nbrOfBanks" type="uint" value="16" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="32768" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="1200" />
-      <parameter id="REFI" type="uint" value="4680" />
-      <parameter id="RFC" type="uint" value="313" />
-      <parameter id="RL" type="uint" value="16" />
-      <parameter id="WL" type="uint" value="16" />
-      <parameter id="CL" type="uint" value="16" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="16" />
-      <parameter id="RAS" type="uint" value="39" />
-      <parameter id="RCD" type="uint" value="16" />
-      <parameter id="RC" type="uint" value="55" />
-      <parameter id="FAW" type="uint" value="26" />
-      <parameter id="RTP" type="uint" value="12" />
-      <parameter id="WR" type="uint" value="18" />
-      <parameter id="RRD_S" type="uint" value="4" />
-      <parameter id="RRD_L" type="uint" value="6" />
-      <parameter id="CCD_S" type="uint" value="4" />
-      <parameter id="CCD_L" type="uint" value="6" />
-      <parameter id="WTR_S" type="uint" value="3" />
-      <parameter id="WTR_L" type="uint" value="9" />
-      <parameter id="DQSCK" type="uint" value="2" />
-      <parameter id="XP" type="uint" value="8" />
-      <parameter id="XPDLL" type="uint" value="325" />
-      <parameter id="XS" type="uint" value="324" />
-      <parameter id="XSDLL" type="uint" value="512" />
-      <parameter id="CKE" type="uint" value="6" />
-      <parameter id="CKESR" type="uint" value="7" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="60.75" />
-      <parameter id="idd02" type="double" value="4.05" />
-      <parameter id="idd2p0" type="double" value="17.0" />
-      <parameter id="idd2p1" type="double" value="17.0" />
-      <parameter id="idd2n" type="double" value="38.25" />
-      <parameter id="idd3p0" type="double" value="22.5" />
-      <parameter id="idd3p1" type="double" value="22.5" />
-      <parameter id="idd3n" type="double" value="44.0" />
-      <parameter id="idd4r" type="double" value="184.5" />
-      <parameter id="idd4w" type="double" value="168.75" />
-      <parameter id="idd5" type="double" value="118.0" />
-      <parameter id="idd6" type="double" value="20.25" />
-      <parameter id="idd62" type="double" value="2.6" />
-      <parameter id="vdd" type="double" value="1.2" />
-      <parameter id="vdd2" type="double" value="2.5" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml
deleted file mode 100644
index 19780c3a..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1333_32bit_A.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_4Gb_LPDDR3-1333_32bit_A" />
-  <parameter id="memoryType" type="string" value="LPDDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="32" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="667" />
-      <parameter id="REFI" type="uint" value="2600" />
-      <parameter id="RFC" type="uint" value="87" />
-      <parameter id="RL" type="uint" value="10" />
-      <parameter id="WL" type="uint" value="8" />
-      <parameter id="CL" type="uint" value="10" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="12" />
-      <parameter id="RAS" type="uint" value="30" />
-      <parameter id="RCD" type="uint" value="12" />
-      <parameter id="RC" type="uint" value="40" />
-      <parameter id="FAW" type="uint" value="40" />
-      <parameter id="RRD" type="uint" value="8" />
-      <parameter id="RTP" type="uint" value="8" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="8" />
-      <parameter id="DQSCK" type="uint" value="2" />
-      <parameter id="XP" type="uint" value="6" />
-      <parameter id="XPDLL" type="uint" value="6" />
-      <parameter id="XS" type="uint" value="94" />
-      <parameter id="XSDLL" type="uint" value="94" />
-      <parameter id="CKE" type="uint" value="6" />
-      <parameter id="CKESR" type="uint" value="12" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="15.0" />
-      <parameter id="idd02" type="double" value="78.0" />
-      <parameter id="idd2p0" type="double" value="0.6" />
-      <parameter id="idd2p02" type="double" value="0.87" />
-      <parameter id="idd2p1" type="double" value="0.6" />
-      <parameter id="idd2p12" type="double" value="0.87" />
-      <parameter id="idd2n" type="double" value="2.0" />
-      <parameter id="idd2n2" type="double" value="36.0" />
-      <parameter id="idd3p0" type="double" value="1.2" />
-      <parameter id="idd3p02" type="double" value="8.15" />
-      <parameter id="idd3p1" type="double" value="1.2" />
-      <parameter id="idd3p12" type="double" value="8.15" />
-      <parameter id="idd3n" type="double" value="2.0" />
-      <parameter id="idd3n2" type="double" value="38.0" />
-      <parameter id="idd4r" type="double" value="5.0" />
-      <parameter id="idd4r2" type="double" value="243.0" />
-      <parameter id="idd4w" type="double" value="10.0" />
-      <parameter id="idd4w2" type="double" value="265.0" />
-      <parameter id="idd5" type="double" value="40.0" />
-      <parameter id="idd52" type="double" value="158.0" />
-      <parameter id="idd6" type="double" value="1.0" />
-      <parameter id="idd62" type="double" value="3.27" />
-      <parameter id="vdd" type="double" value="1.8" />
-      <parameter id="vdd2" type="double" value="1.2" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml b/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml
deleted file mode 100644
index e71930e1..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/MICRON_4Gb_LPDDR3-1600_32bit_A.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE memspec SYSTEM "memspec.dtd">
-<memspec>
-
-  <parameter id="memoryId" type="string" value="MICRON_4Gb_LPDDR3-1600_32bit_A" />
-  <parameter id="memoryType" type="string" value="LPDDR3" />
-  <memarchitecturespec>
-    <parameter id="width" type="uint" value="32" />
-    <parameter id="nbrOfBanks" type="uint" value="8" />
-    <parameter id="nbrOfRanks" type="uint" value="1" />
-    <parameter id="nbrOfColumns" type="uint" value="1024" />
-    <parameter id="nbrOfRows" type="uint" value="16384" />
-    <parameter id="dataRate" type="uint" value="2" />
-    <parameter id="burstLength" type="uint" value="8" />
-  </memarchitecturespec>
-  <memtimingspec>
-      <parameter id="clkMhz" type="double" value="800" />
-      <parameter id="REFI" type="uint" value="3120" />
-      <parameter id="RFC" type="uint" value="104" />
-      <parameter id="RL" type="uint" value="12" />
-      <parameter id="WL" type="uint" value="9" />
-      <parameter id="CL" type="uint" value="12" />
-      <parameter id="AL" type="uint" value="0" />
-      <parameter id="RP" type="uint" value="15" />
-      <parameter id="RAS" type="uint" value="36" />
-      <parameter id="RCD" type="uint" value="15" />
-      <parameter id="RC" type="uint" value="48" />
-      <parameter id="FAW" type="uint" value="40" />
-      <parameter id="RRD" type="uint" value="8" />
-      <parameter id="RTP" type="uint" value="8" />
-      <parameter id="WR" type="uint" value="12" />
-      <parameter id="CCD" type="uint" value="4" />
-      <parameter id="WTR" type="uint" value="8" />
-      <parameter id="DQSCK" type="uint" value="2" />
-      <parameter id="XP" type="uint" value="6" />
-      <parameter id="XPDLL" type="uint" value="6" />
-      <parameter id="XS" type="uint" value="112" />
-      <parameter id="XSDLL" type="uint" value="112" />
-      <parameter id="CKE" type="uint" value="6" />    
-      <parameter id="CKESR" type="uint" value="12" />
-  </memtimingspec>
-  <mempowerspec>
-      <parameter id="idd0" type="double" value="15.0" />
-      <parameter id="idd02" type="double" value="80.0" />
-      <parameter id="idd2p0" type="double" value="0.6" />
-      <parameter id="idd2p02" type="double" value="0.87" />
-      <parameter id="idd2p1" type="double" value="0.6" />
-      <parameter id="idd2p12" type="double" value="0.87" />
-      <parameter id="idd2n" type="double" value="2.0" />
-      <parameter id="idd2n2" type="double" value="38.0" />
-      <parameter id="idd3p0" type="double" value="1.2" />
-      <parameter id="idd3p02" type="double" value="8.15" />
-      <parameter id="idd3p1" type="double" value="1.2" />
-      <parameter id="idd3p12" type="double" value="8.15" />
-      <parameter id="idd3n" type="double" value="2.0" />
-      <parameter id="idd3n2" type="double" value="45.0" />
-      <parameter id="idd4r" type="double" value="5.0" />
-      <parameter id="idd4r2" type="double" value="260.0" />
-      <parameter id="idd4w" type="double" value="10.0" />
-      <parameter id="idd4w2" type="double" value="284.0" />
-      <parameter id="idd5" type="double" value="40.0" />
-      <parameter id="idd52" type="double" value="160.0" />
-      <parameter id="idd6" type="double" value="1.0" />
-      <parameter id="idd62" type="double" value="3.27" />
-      <parameter id="vdd" type="double" value="1.8" />
-      <parameter id="vdd2" type="double" value="1.2" />
-  </mempowerspec>
-</memspec>
diff --git a/dram/resources/configs/memspecs/dram-power-original/memspecs/memspec.dtd b/dram/resources/configs/memspecs/dram-power-original/memspecs/memspec.dtd
deleted file mode 100644
index f94ed9e9..00000000
--- a/dram/resources/configs/memspecs/dram-power-original/memspecs/memspec.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ELEMENT memspec (parameter*,memarchitecturespec,memtimingspec,mempowerspec)>
-
-<!ELEMENT parameter EMPTY>
-<!ATTLIST parameter id CDATA #REQUIRED>
-<!ATTLIST parameter type CDATA #REQUIRED>
-<!ATTLIST parameter value CDATA #REQUIRED>
-<!ATTLIST parameter unit CDATA #IMPLIED>
-
-<!ELEMENT memarchitecturespec (parameter*)>
-
-<!ELEMENT memtimingspec (parameter*)>
-
-<!ELEMENT mempowerspec (parameter*)>

From 6ee652bdcafdada93e32c1573be54730d4dc3ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Fri, 8 May 2015 15:55:27 +0200
Subject: [PATCH 6/9] Typo fixed (PowerAnalysys --> PowerAnalysis)

---
 dram/resources/configs/simconfigs/simple.xml | 4 ++--
 dram/resources/simulations/sim-batch.xml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dram/resources/configs/simconfigs/simple.xml b/dram/resources/configs/simconfigs/simple.xml
index 2afec97e..4b3322c8 100644
--- a/dram/resources/configs/simconfigs/simple.xml
+++ b/dram/resources/configs/simconfigs/simple.xml
@@ -1,5 +1,5 @@
 <simconfig>
   <DatabaseRecording value="1" />
-  <PowerAnalysys value="0" />
+  <PowerAnalysis value="0" />
   <Debug value="0" />
-</simconfig>
\ No newline at end of file
+</simconfig>
diff --git a/dram/resources/simulations/sim-batch.xml b/dram/resources/simulations/sim-batch.xml
index bf579499..f28d961a 100644
--- a/dram/resources/simulations/sim-batch.xml
+++ b/dram/resources/simulations/sim-batch.xml
@@ -2,7 +2,7 @@
         <simconfig>
                     <Debug value="1" />
                     <DatabaseRecording value="1" />
-                    <PowerAnalysys value="0" />
+                    <PowerAnalysis value="0" />
         </simconfig>
         <memspecs>
                 <memspec src="/home/gernhard2/projects/dram.vp.system/dram/resources/configs/memspecs/WideIO.xml"></memspec>
@@ -28,7 +28,7 @@
         <simconfig>
                     <Debug value="1" />
                     <DatabaseRecording value="1" />
-                    <PowerAnalysys value="1" />
+                    <PowerAnalysis value="1" />
         </simconfig>
         <memspecs>
                 <memspec src="../resources/configs/memspecs/WideIO.xml"></memspec>

From 48154a356db500dac3c3213a877c7e91ded48376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Fri, 8 May 2015 16:00:50 +0200
Subject: [PATCH 7/9] Added macro that creates enums with string conversion
 function automatically.

---
 dram/src/common/Utils.h                       | 41 ++++++++++++++++++-
 .../core/configuration/Configuration.h        |  3 +-
 dram/src/simulation/Dram.h                    |  2 +-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/dram/src/common/Utils.h b/dram/src/common/Utils.h
index acb5b93b..af637782 100644
--- a/dram/src/common/Utils.h
+++ b/dram/src/common/Utils.h
@@ -13,9 +13,10 @@
 #include <string>
 #include <ostream>
 #include <tlm.h>
+#include <boost/preprocessor.hpp>
+#include <iomanip>
 #include "dramExtension.h"
 #include "third_party/tinyxml2.h"
-#include <iomanip>
 
 //TODO : move to timing specific header
 sc_time getDistance(sc_time a, sc_time b);
@@ -87,5 +88,43 @@ double queryDoubleParameter(tinyxml2::XMLElement* node, std::string name);
 
 void setUpDummy(tlm::tlm_generic_payload& payload, Bank& bank);
 
+//
+// BOOST_PP_STRINGIZE(text)
+// text will be converted to a string literal.
+//
+// BOOST_PP_SEQ_ENUM(enumerators)
+// This macro expands to a comma-separated list of the elements in
+// enumerators.
+//
+// BOOST_PP_SEQ_FOR_EACH(macro, data, seq)
+// This macro is a repetition construct. If seq is (a)(b)(c), it expands to
+// the sequence: macro(r, data, a) macro(r, data, b) macro(r, data, c)
+//
+// Note: this implementation requires that the enumerators map to unique
+// values.
+//
+// See also:
+// http://www.boost.org/doc/libs/1_38_0/libs/preprocessor/doc/
+// http://stackoverflow.com/questions/5093460/how-to-convert-an-enum-type-variable-to-a-string
+//
+#define X_DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOSTRING_CASE(r, data, elem)    \
+    case data::elem : return BOOST_PP_STRINGIZE(elem);
+
+#define DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(enumName, enumerators)            \
+    enum class enumName {                                                           \
+        BOOST_PP_SEQ_ENUM(enumerators)                                              \
+    };                                                                              \
+                                                                                    \
+    inline const char* ToString(enumName v)                                         \
+    {                                                                               \
+        switch (v) {                                                                \
+            BOOST_PP_SEQ_FOR_EACH(                                                  \
+                X_DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOSTRING_CASE,          \
+                enumName,                                                           \
+                enumerators                                                         \
+            )                                                                       \
+            default: return "[Unknown " BOOST_PP_STRINGIZE(name) "]";               \
+        }                                                                           \
+    }
 
 #endif /* UTILS_COMMON_H_ */
diff --git a/dram/src/controller/core/configuration/Configuration.h b/dram/src/controller/core/configuration/Configuration.h
index 552c212b..3cab2900 100644
--- a/dram/src/controller/core/configuration/Configuration.h
+++ b/dram/src/controller/core/configuration/Configuration.h
@@ -11,9 +11,10 @@
 #include <systemc.h>
 #include <string>
 #include "MemSpec.h"
+#include "../../../common/Utils.h"
 
 enum class EPowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF};
-enum class StorageMode{NoStorage, Store, ErrorModel};
+DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(StorageMode, (NoStorage) (Store) (ErrorModel));
 
 struct Configuration
 {
diff --git a/dram/src/simulation/Dram.h b/dram/src/simulation/Dram.h
index d7497472..c1fdfe45 100644
--- a/dram/src/simulation/Dram.h
+++ b/dram/src/simulation/Dram.h
@@ -61,7 +61,7 @@ struct Dram: sc_module
 
         IFPOW( MemorySpecification memSpec(MemSpecParser::getMemSpecFromXML(Configuration::getInstance().memspecUri)) );
         IFPOW( DRAMPower = new libDRAMPower( memSpec, 0 ) );
-        //cout << "StorageMode = " << StorMode << endl;
+        cout << "StorageMode = " << ToString(StorMode) << endl;
 
         if(StorMode == StorageMode::ErrorModel)
         {

From 0fc640ad0ddaa7c4d269d78993827f9b38f69876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Mon, 11 May 2015 12:46:21 +0200
Subject: [PATCH 8/9] Enum class <-> string macro improved.

The macro generates code for two functions: EnumToString() and StringToEnum().

Notes:
1. this macro creates a scoped enumeration (enum class) which favors code
readability;

2. this implementation does not support assignment of values to enumerators
and also does not support multiple enumerators with the same value. The first
enumerator value is 0, the next is 1, and so on. Nevertheless, it is still
useful for many cases;

3. if an invalid string is passed to StringToEnum() the program will be
aborted and an error message describing the error will be displayed in the
standard output.
---
 dram/src/common/Utils.h                       | 72 ++++++++++---------
 .../core/configuration/Configuration.cpp      | 17 +----
 .../core/configuration/Configuration.h        |  2 +-
 dram/src/simulation/Dram.h                    |  2 +-
 4 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/dram/src/common/Utils.h b/dram/src/common/Utils.h
index af637782..f3e8394e 100644
--- a/dram/src/common/Utils.h
+++ b/dram/src/common/Utils.h
@@ -88,43 +88,45 @@ double queryDoubleParameter(tinyxml2::XMLElement* node, std::string name);
 
 void setUpDummy(tlm::tlm_generic_payload& payload, Bank& bank);
 
-//
-// BOOST_PP_STRINGIZE(text)
-// text will be converted to a string literal.
-//
-// BOOST_PP_SEQ_ENUM(enumerators)
-// This macro expands to a comma-separated list of the elements in
-// enumerators.
-//
-// BOOST_PP_SEQ_FOR_EACH(macro, data, seq)
-// This macro is a repetition construct. If seq is (a)(b)(c), it expands to
-// the sequence: macro(r, data, a) macro(r, data, b) macro(r, data, c)
-//
-// Note: this implementation requires that the enumerators map to unique
-// values.
-//
-// See also:
-// http://www.boost.org/doc/libs/1_38_0/libs/preprocessor/doc/
-// http://stackoverflow.com/questions/5093460/how-to-convert-an-enum-type-variable-to-a-string
-//
-#define X_DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOSTRING_CASE(r, data, elem)    \
+#define DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOSTRING_CASE(r, data, elem)  \
     case data::elem : return BOOST_PP_STRINGIZE(elem);
 
-#define DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(enumName, enumerators)            \
-    enum class enumName {                                                           \
-        BOOST_PP_SEQ_ENUM(enumerators)                                              \
-    };                                                                              \
-                                                                                    \
-    inline const char* ToString(enumName v)                                         \
-    {                                                                               \
-        switch (v) {                                                                \
-            BOOST_PP_SEQ_FOR_EACH(                                                  \
-                X_DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOSTRING_CASE,          \
-                enumName,                                                           \
-                enumerators                                                         \
-            )                                                                       \
-            default: return "[Unknown " BOOST_PP_STRINGIZE(name) "]";               \
-        }                                                                           \
+#define DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOENUM_IF(r, data, elem)      \
+    if (BOOST_PP_SEQ_TAIL(data) == BOOST_PP_STRINGIZE(elem))                    \
+        return BOOST_PP_SEQ_HEAD(data)::elem; else
+
+#define DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(enumName, enumerators)        \
+    enum class enumName {                                                       \
+        BOOST_PP_SEQ_ENUM(enumerators)                                          \
+    };                                                                          \
+                                                                                \
+    inline const char *EnumToString(enumName v)                                 \
+    {                                                                           \
+        switch (v) {                                                            \
+            BOOST_PP_SEQ_FOR_EACH(                                              \
+                DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOSTRING_CASE,        \
+                enumName,                                                       \
+                enumerators                                                     \
+            )                                                                   \
+            default: return "[Unknown " BOOST_PP_STRINGIZE(name) "]";           \
+        }                                                                       \
+    }                                                                           \
+                                                                                \
+    inline enumName StringToEnum(std::string s)                                 \
+    {                                                                           \
+        BOOST_PP_SEQ_FOR_EACH(                                                  \
+            DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS_TOENUM_IF,                \
+            (enumName)(s),                                                      \
+            enumerators                                                         \
+        )                                                                       \
+        {                                                                       \
+            SC_REPORT_FATAL("Configuration",                                    \
+                ("Invalid string \"" + s + "\" for conversion into enum \""     \
+                + BOOST_PP_STRINGIZE(enumName) + "\"").c_str()                  \
+            );                                                                  \
+            throw;                                                              \
+        }                                                                       \
     }
 
 #endif /* UTILS_COMMON_H_ */
+
diff --git a/dram/src/controller/core/configuration/Configuration.cpp b/dram/src/controller/core/configuration/Configuration.cpp
index 5d8449ff..1314c61f 100644
--- a/dram/src/controller/core/configuration/Configuration.cpp
+++ b/dram/src/controller/core/configuration/Configuration.cpp
@@ -57,21 +57,6 @@ EPowerDownMode string2PDNMode(string s)
     }
 }
 
-StorageMode string2StorageMode(string s)
-{
-    if (s == "NoStorage")
-            return StorageMode::NoStorage;
-    else if (s == "Store")
-            return StorageMode::Store;
-    else if (s == "ErrorModel")
-            return StorageMode::ErrorModel;
-    else
-    {
-        SC_REPORT_FATAL("Configuration", ("Unknown StorageMode: " + s).c_str());
-        throw;
-    }
-}
-
 void Configuration::setParameter(std::string name, std::string value)
 {
     if(name == "BankwiseLogic")
@@ -113,7 +98,7 @@ void Configuration::setParameter(std::string name, std::string value)
     else if(name == "csvfile")
         csvfile = value;
     else if(name == "StorMo")
-        StorMode = string2StorageMode(value);
+        StorMode = StringToEnum(value);
     else
     {
         SC_REPORT_FATAL("Configuration", ("Parameter " + name + " not defined in Configuration").c_str());
diff --git a/dram/src/controller/core/configuration/Configuration.h b/dram/src/controller/core/configuration/Configuration.h
index 3cab2900..85a257d8 100644
--- a/dram/src/controller/core/configuration/Configuration.h
+++ b/dram/src/controller/core/configuration/Configuration.h
@@ -14,7 +14,7 @@
 #include "../../../common/Utils.h"
 
 enum class EPowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF};
-DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(StorageMode, (NoStorage) (Store) (ErrorModel));
+DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(StorageMode, (NoStorage)(Store)(ErrorModel));
 
 struct Configuration
 {
diff --git a/dram/src/simulation/Dram.h b/dram/src/simulation/Dram.h
index c1fdfe45..a5315a4f 100644
--- a/dram/src/simulation/Dram.h
+++ b/dram/src/simulation/Dram.h
@@ -61,7 +61,7 @@ struct Dram: sc_module
 
         IFPOW( MemorySpecification memSpec(MemSpecParser::getMemSpecFromXML(Configuration::getInstance().memspecUri)) );
         IFPOW( DRAMPower = new libDRAMPower( memSpec, 0 ) );
-        cout << "StorageMode = " << ToString(StorMode) << endl;
+        cout << "StorageMode: " << EnumToString(StorMode) << endl;
 
         if(StorMode == StorageMode::ErrorModel)
         {

From 9846a56da4812f20fb50a0d1cd3ef4075182a2b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Mon, 11 May 2015 14:08:39 +0200
Subject: [PATCH 9/9] Some names slightly changed to better describe their
 purpose.

ChipSeed --> ErrorChipSeed
csvfile --> ErrorCSVFile
StorMo --> ErrorStoreMode
StorMode --> ErrorStoreMode
StorageMode --> ErrorStorageMode

(Changes after code review)
---
 dram/resources/configs/memconfigs/fifo.xml    |  7 ++---
 .../configs/memconfigs/fifoStrict.xml         |  6 ++--
 dram/resources/configs/memconfigs/fr_fcfs.xml |  6 ++--
 .../core/configuration/Configuration.cpp      | 14 +++++-----
 .../core/configuration/Configuration.h        | 10 +++----
 dram/src/error/flip_memory.cpp                |  4 +--
 dram/src/simulation/Dram.h                    | 28 +++++++++----------
 7 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/dram/resources/configs/memconfigs/fifo.xml b/dram/resources/configs/memconfigs/fifo.xml
index 97064ad2..6d1fd110 100644
--- a/dram/resources/configs/memconfigs/fifo.xml
+++ b/dram/resources/configs/memconfigs/fifo.xml
@@ -7,8 +7,7 @@
   <PowerDownMode value="TimeoutSREF" />
   <PowerDownTimeout value="100" />
   <!-- Error Modelling -->
-  <Chipseed value="42" />
-  <csvfile value="../src/error/error_new.csv" />
-
-  <StorMo value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
+  <ErrorChipSeed value="42" />
+  <ErrorCSVFile value="../src/error/error_new.csv" />
+  <ErrorStoreMode value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
 </memconfig>
diff --git a/dram/resources/configs/memconfigs/fifoStrict.xml b/dram/resources/configs/memconfigs/fifoStrict.xml
index 2bb773c9..ac3522ef 100644
--- a/dram/resources/configs/memconfigs/fifoStrict.xml
+++ b/dram/resources/configs/memconfigs/fifoStrict.xml
@@ -7,7 +7,7 @@
   <PowerDownMode value="TimeoutPDN" />
   <PowerDownTimeout value="100" />
   <!-- Error Modelling -->
-  <Chipseed value="42" />
-  <csvfile value="../src/error/error_new.csv" />
-  <StorMo value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
+  <ErrorChipSeed value="42" />
+  <ErrorCSVFile value="../src/error/error_new.csv" />
+  <ErrorStoreMode value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
 </memconfig>
diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/dram/resources/configs/memconfigs/fr_fcfs.xml
index de65253a..4285a3cb 100644
--- a/dram/resources/configs/memconfigs/fr_fcfs.xml
+++ b/dram/resources/configs/memconfigs/fr_fcfs.xml
@@ -7,9 +7,9 @@
   <PowerDownMode value="TimeoutPDN" />
   <PowerDownTimeout value="100" />
   <!-- Error Model: -->
-  <Chipseed value="42" />
-  <csvfile value="../src/error/error_new.csv" />
-  <StorMo value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
+  <ErrorChipSeed value="42" />
+  <ErrorCSVFile value="../src/error/error_new.csv" />
+  <ErrorStoreMode value="NoStorage" /> <!--3 Modes: NoStorage, Store (store data without errormodel), ErrorModel (store data with errormodel)-->
   <!-- 
   <Buswidth value="128" />
   <ReadWriteGrouping value="false" />
diff --git a/dram/src/controller/core/configuration/Configuration.cpp b/dram/src/controller/core/configuration/Configuration.cpp
index 1314c61f..ada11576 100644
--- a/dram/src/controller/core/configuration/Configuration.cpp
+++ b/dram/src/controller/core/configuration/Configuration.cpp
@@ -92,13 +92,13 @@ void Configuration::setParameter(std::string name, std::string value)
         PowerAnalysis = string2bool(value);
     else if(name == "Debug")
         Debug = string2bool(value);
-    //Specification for Chipseed, csvfile path and StorageMode
-    else if(name == "Chipseed")
-        Chipseed = string2int(value);
-    else if(name == "csvfile")
-        csvfile = value;
-    else if(name == "StorMo")
-        StorMode = StringToEnum(value);
+    // Specification for ErrorChipSeed, ErrorCSVFile path and ErrorStoreMode
+    else if(name == "ErrorChipSeed")
+        ErrorChipSeed = string2int(value);
+    else if(name == "ErrorCSVFile")
+        ErrorCSVFile = value;
+    else if(name == "ErrorStoreMode")
+        ErrorStoreMode = StringToEnum(value);
     else
     {
         SC_REPORT_FATAL("Configuration", ("Parameter " + name + " not defined in Configuration").c_str());
diff --git a/dram/src/controller/core/configuration/Configuration.h b/dram/src/controller/core/configuration/Configuration.h
index 85a257d8..11b844e4 100644
--- a/dram/src/controller/core/configuration/Configuration.h
+++ b/dram/src/controller/core/configuration/Configuration.h
@@ -14,7 +14,7 @@
 #include "../../../common/Utils.h"
 
 enum class EPowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF};
-DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(StorageMode, (NoStorage)(Store)(ErrorModel));
+DEFINE_ENUM_CLASS_WITH_STRING_CONVERSIONS(ErrorStorageMode, (NoStorage)(Store)(ErrorModel));
 
 struct Configuration
 {
@@ -52,10 +52,10 @@ struct Configuration
     void setParameter(std::string name, std::string value);
     void setParameters(std::map<std::string, std::string> parameterMap);
 
-    //Configs for Seed, csv file and StorageMode
-    unsigned int Chipseed;
-    std::string csvfile ="not defined.";
-    StorageMode StorMode;
+    //Configs for Seed, csv file and ErrorStorageMode
+    unsigned int ErrorChipSeed;
+    std::string ErrorCSVFile ="not defined.";
+    ErrorStorageMode ErrorStoreMode;
 
 private:
     Configuration();
diff --git a/dram/src/error/flip_memory.cpp b/dram/src/error/flip_memory.cpp
index adeeb580..3aa63a25 100644
--- a/dram/src/error/flip_memory.cpp
+++ b/dram/src/error/flip_memory.cpp
@@ -30,7 +30,7 @@ flip_memory::flip_memory()
 	// Initialize Random generator with current system time
 	// Only do this once in a simulation
 	//srand(time(NULL));
-	srand(Configuration::getInstance().Chipseed); // Chipseed constant, so that errors allways at the same address
+	srand(Configuration::getInstance().ErrorChipSeed); // ErrorChipSeed constant, so that errors allways at the same address
 
 	// Fixed values for development process
 	TEMPERATURE = 90;
@@ -39,7 +39,7 @@ flip_memory::flip_memory()
 	BIT_ERR = 0;
 
 	// path of csv file
-	errormap = new nest_map(Configuration::getInstance().csvfile);
+	errormap = new nest_map(Configuration::getInstance().ErrorCSVFile);
 
 	// Constants for address calculations
 	ROWS_PER_BANK = Configuration::getInstance().memSpec.NumberOfRows;  //8192
diff --git a/dram/src/simulation/Dram.h b/dram/src/simulation/Dram.h
index a5315a4f..b77bf235 100644
--- a/dram/src/simulation/Dram.h
+++ b/dram/src/simulation/Dram.h
@@ -50,7 +50,7 @@ struct Dram: sc_module
     tlm_utils::simple_target_socket<Dram, BUSWIDTH, tlm::tlm_base_protocol_types> tSocket;
     IFPOW(libDRAMPower *DRAMPower);
 
-    StorageMode StorMode = Configuration::getInstance().StorMode;
+    ErrorStorageMode ErrorStoreMode = Configuration::getInstance().ErrorStoreMode;
 
     flip_memory * fmemory; 
     map< unsigned long int, unsigned char[BUSWIDTH/2] > memory;
@@ -61,9 +61,9 @@ struct Dram: sc_module
 
         IFPOW( MemorySpecification memSpec(MemSpecParser::getMemSpecFromXML(Configuration::getInstance().memspecUri)) );
         IFPOW( DRAMPower = new libDRAMPower( memSpec, 0 ) );
-        cout << "StorageMode: " << EnumToString(StorMode) << endl;
+        cout << "ErrorStorageMode: " << EnumToString(ErrorStoreMode) << endl;
 
-        if(StorMode == StorageMode::ErrorModel)
+        if(ErrorStoreMode == ErrorStorageMode::ErrorModel)
         {
             fmemory = new flip_memory[Configuration::getInstance().memSpec.NumberOfBanks];
         }
@@ -75,7 +75,7 @@ struct Dram: sc_module
         IFPOW( DRAMPower->calcEnergy() );
         IFPOW( cout << endl << endl << "Total Energy" << "\t" << DRAMPower->getEnergy().total_energy << endl);
         IFPOW( cout << "Average Power" << "\t" << DRAMPower->getPower().average_power << endl );
-        if(StorMode == StorageMode::ErrorModel)
+        if(ErrorStoreMode == ErrorStorageMode::ErrorModel)
         {
             for(int b = 0; b < 8; b++)
             {
@@ -111,7 +111,7 @@ struct Dram: sc_module
             sendToController(payload, END_ACT, delay +  getExecutionTime(Command::Activate, payload));
             unsigned int row = DramExtension::getExtension(payload).getRow().ID();
 
-            if (StorMode == StorageMode::ErrorModel)
+            if (ErrorStoreMode == ErrorStorageMode::ErrorModel)
             {
                 fmemory[bank].refresh(row);
             }
@@ -121,11 +121,11 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::WR, bank, cycle));
 
             //save data:
-            if (StorMode == StorageMode::NoStorage)
+            if (ErrorStoreMode == ErrorStorageMode::NoStorage)
             {
                 // Don't store data
             }
-            else if (StorMode == StorageMode::Store) // Use Storage
+            else if (ErrorStoreMode == ErrorStorageMode::Store) // Use Storage
             {
                 memcpy(&memory[payload.get_address()], payload.get_data_ptr(), BUSWIDTH/8);
             }
@@ -140,7 +140,7 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::RD, bank, cycle));
 
             // Load data:
-            if (StorMode == StorageMode::Store)    //use StorageMode
+            if (ErrorStoreMode == ErrorStorageMode::Store)    //use ErrorStorageMode
             {
                 if(memory.count(payload.get_address()) == 1)
                 {
@@ -151,7 +151,7 @@ struct Dram: sc_module
                     //SC_REPORT_WARNING ("DRAM", "Reading from an empty memory location.");
                 }
             }
-            else if(StorMode == StorageMode::ErrorModel)// use StorageMode with errormodel
+            else if(ErrorStoreMode == ErrorStorageMode::ErrorModel)// use ErrorStorageMode with errormodel
             {
                 fmemory[bank].load(payload);
             }
@@ -163,11 +163,11 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::WRA, bank, cycle));
 
             //save data:
-            if (StorMode == StorageMode::NoStorage)
+            if (ErrorStoreMode == ErrorStorageMode::NoStorage)
             {
                 // Don't store data
             }
-            else if (StorMode == StorageMode::Store) // Use Storage
+            else if (ErrorStoreMode == ErrorStorageMode::Store) // Use Storage
             {
                 memcpy(&memory[payload.get_address()], payload.get_data_ptr(), BUSWIDTH/8);
             }
@@ -182,7 +182,7 @@ struct Dram: sc_module
             IFPOW(DRAMPower->doCommand(MemCommand::RDA, bank, cycle));
 
             // Load data:
-            if (StorMode == StorageMode::Store)    //use StorageMode
+            if (ErrorStoreMode == ErrorStorageMode::Store)    //use ErrorStorageMode
             {
                 if(memory.count(payload.get_address()) == 1)
                 {
@@ -193,7 +193,7 @@ struct Dram: sc_module
                     //SC_REPORT_WARNING ("DRAM", "Reading from an empty memory location.");
                 }
             }
-            else if(StorMode == StorageMode::ErrorModel)// use StorageMode with errormodel
+            else if(ErrorStoreMode == ErrorStorageMode::ErrorModel)// use ErrorStorageMode with errormodel
             {
                 fmemory[bank].load(payload);
             }
@@ -206,7 +206,7 @@ struct Dram: sc_module
             sendToController(payload, END_REFA, delay +  getExecutionTime(Command::AutoRefresh, payload));
             unsigned int row = DramExtension::getExtension(payload).getRow().ID();
 
-            if (StorMode == StorageMode::ErrorModel)
+            if (ErrorStoreMode == ErrorStorageMode::ErrorModel)
             {
                 fmemory[bank].refresh(row);
             }