* default.cfg: Updated to new config.

* current.cfg: Likewise.
* default.gmap: New.

diff --git a/utils/mep/ChangeLog b/utils/mep/ChangeLog
index 37e65d7..63cfcfe 100644 (file)
--- a/utils/mep/ChangeLog
+++ b/utils/mep/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02  DJ Delorie  <dj@redhat.com>
+
+       * default.cfg: Updated to new config.
+       * current.cfg: Likewise.
+       * default.gmap: New.
+
 2007-02-19  Dave Brolley  <brolley@redhat.com>
 
        * mepcfgtool.c (do_sidmain_config): Don't call scan_mm_int or

diff --git a/utils/mep/current.cfg b/utils/mep/current.cfg
index d25b026..9a0a41e 100644 (file)
--- a/utils/mep/current.cfg
+++ b/utils/mep/current.cfg
@@ -1,36 +1,10 @@
-ME_MODULE [simple] {
+GLOBAL_MAP = "default.gmap";
+MEP_CORE_TYPE = "c4";
+LITTLE_ENDIAN = YES;
+ME_MODULE [default] {
     ME_ENGINE {
         CORE {
-            ID = 1;
-            MUL = OFF;
-            DIV = OFF;
-            BIT = OFF;
-            LDZ = OFF;
-            ABS = OFF;
-            AVE = OFF;
-            MIN = OFF;
-            CLP = OFF;
-            SAT = OFF;
-        };
-        BIU {
-            DATA_WIDTH = 64;
-        };
-        INTC {
-            CHANNEL_BITW = 8;
-            LEVEL = 15;
-        };
-    };
-    MAIN_BUS_IF {
-        DATA_WIDTH = 64;
-    };
-    LOCAL_BUS {
-        DATA_WIDTH = 64;
-    };
-};
-ME_MODULE [fmax] {
-    ME_ENGINE {
-        CORE {
-            ID = 2;
+            ID = 50;
             MUL = ON;
             DIV = ON;
             BIT = ON;
@@ -41,20 +15,40 @@ ME_MODULE [fmax] {
             CLP = ON;
             SAT = ON;
         };
-        BIU {
-            DATA_WIDTH = 64;
+        IMEM {
+            SIZE = 32;
+        };
+        DMEM {
+            BANK_NUM = 4;
+            SIZE = 128;
+        };
+        ICACHE {
+            SIZE = 16;
+            LINE_SIZE = 32;
+            WAY = 1;
+            CWF = OFF;
+        };
+        DCACHE {
+            SIZE = 16;
+            LINE_SIZE = 32;
+            WAY = 1;
+            CWF = OFF;
         };
         INTC {
-            CHANNEL_BITW = 8;
+            CHANNEL_BITW = 32;
             LEVEL = 15;
         };
+        TIMER {
+            CHANNEL_BITW = 4;
+        };
+        BIU {
+            DATA_WIDTH = 64;
+        };
     };
-    COP [fmax_cop] {
-        VLIW_TYPE = NO;
-        VLIW_BITW = 32;
-        DATA_BUS_WIDTH = 32;
-        CBUS_IF = OFF;
-        IP = "FMAX";
+    DMAC {
+        CHANNEL_BITW = 6;
+        DATA_WIDTH = 64;
+        RECTANGLE = ON;
     };
     MAIN_BUS_IF {
         DATA_WIDTH = 64;
@@ -63,4 +57,3 @@ ME_MODULE [fmax] {
         DATA_WIDTH = 64;
     };
 };
-MEP_CORE_TYPE = "c2";

diff --git a/utils/mep/default.cfg b/utils/mep/default.cfg
index 979b18f..8754d13 100644 (file)
--- a/utils/mep/default.cfg
+++ b/utils/mep/default.cfg
@@ -1,25 +1,52 @@
 CHIP_NAME = "Red Hat default configuration";
 
-ME_MODULE [simple] {
-    ME_ENGINE {
-       CORE { ID = 1; };
-    };
-};
+GLOBAL_MAP = "default.gmap";
 
-ME_MODULE [fmax] {
-    ME_ENGINE {
-       CORE {
-           ID = 2;
-            MUL = ON;
-            DIV = ON;
-            BIT = ON;
-            LDZ = ON;
-            ABS = ON;
-            AVE = ON;
-            MIN = ON;
-            CLP = ON;
-            SAT = ON;
+MEP_CORE_TYPE="c4";
+
+LITTLE_ENDIAN = YES;
+
+ME_MODULE [ default ] {
+       ME_ENGINE {
+               CORE {
+                       ID = 50;
+                       MUL = ON;
+                       DIV = ON;
+                       BIT = ON;
+                       LDZ = ON;
+                       ABS = ON;
+                       AVE = ON;
+                       MIN = ON;
+                       CLP = ON;
+                       SAT = ON;
+               };
+               IMEM {
+                       SIZE = 32;
+               };
+               DMEM {
+                       BANK_NUM = 4;
+                       SIZE = 128;
+               };
+               ICACHE {
+                       SIZE = 16;
+               };
+               DCACHE {
+                       SIZE = 16;
+               };
+               INTC {
+                       CHANNEL_BITW = 32;
+                       LEVEL = 15;
+               };
+               TIMER {
+                       CHANNEL_BITW = 4;
+               };
+               BIU {
+                       DATA_WIDTH = 64;
+               };
+       };
+       DMAC {
+               CHANNEL_BITW = 6;
+               DATA_WIDTH = 64;
+               RECTANGLE = ON;
        };
-    };
-    COP [ fmax_cop ] { IP = "FMAX"; };
-};
+};  

diff --git a/utils/mep/default.gmap b/utils/mep/default.gmap
new file mode 100644 (file)
index 0000000..8fb2788
--- /dev/null
+++ b/utils/mep/default.gmap
@@ -0,0 +1,6 @@
+// Default global map file
+//start:size:name:cache:shadow_original:scope:type:read_write;
+0x0000_0000:0x0020_0000:RAM1:     ::global:memory:ro;
+0x0080_0000:0x0080_0000:RAM2:Cache::global:memory:rw;
+0x8000_0000:0x0080_0000:RAM3:Cache::global:memory:rw;
+