From dfb61fb66f2df32de3597c140f24f8caa53f8766 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 25 May 2011 12:35:05 +0000
Subject: [PATCH] sim: bfin: add bf526-0.2/bf54x-0.4 rom regions

Add regions for the on-chip roms on some newer Blackfin parts.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 sim/bfin/ChangeLog             | 9 +++++++++
 sim/bfin/bfroms/all.h          | 3 +++
 sim/bfin/bfroms/bf526-0.2.h    | 4 ++++
 sim/bfin/bfroms/bf54x-0.4.h    | 4 ++++
 sim/bfin/bfroms/bf54x_l1-0.4.h | 4 ++++
 sim/bfin/machs.c               | 3 +++
 6 files changed, 27 insertions(+)
 create mode 100644 sim/bfin/bfroms/bf526-0.2.h
 create mode 100644 sim/bfin/bfroms/bf54x-0.4.h
 create mode 100644 sim/bfin/bfroms/bf54x_l1-0.4.h

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index b1d4c9bb965..ba36f5465f2 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-25  Mike Frysinger  <vapier@gentoo.org>
+
+	* machs.c (bf526_roms): Add a region with rev of 2.
+	(bf54x_roms): Add regions with rev of 4.
+	* bfroms/all.h: Include new bf526-0.2.h, bf54x-0.4.h, and
+	bf54x_l1-0.4.h headers.
+	* bfroms/bf526-0.2.h, bfroms/bf54x-0.4.h, bfroms/bf54x_l1-0.4.h:
+	New header files.
+
 2011-05-14  Mike Frysinger  <vapier@gentoo.org>
 
 	* bfin-sim.c (decode_PushPopReg_0): Delete (grp == 1 && reg == 6)
diff --git a/sim/bfin/bfroms/all.h b/sim/bfin/bfroms/all.h
index 1b562d9df40..00c23cf0756 100644
--- a/sim/bfin/bfroms/all.h
+++ b/sim/bfin/bfroms/all.h
@@ -6,6 +6,7 @@
 
 #include "bf526-0.0.h"
 #include "bf526-0.1.h"
+#include "bf526-0.2.h"
 #include "bf527-0.0.h"
 #include "bf527-0.1.h"
 #include "bf527-0.2.h"
@@ -32,9 +33,11 @@
 #include "bf54x-0.0.h"
 #include "bf54x-0.1.h"
 #include "bf54x-0.2.h"
+#include "bf54x-0.4.h"
 #include "bf54x_l1-0.0.h"
 #include "bf54x_l1-0.1.h"
 #include "bf54x_l1-0.2.h"
+#include "bf54x_l1-0.4.h"
 
 #include "bf561-0.5.h"
 
diff --git a/sim/bfin/bfroms/bf526-0.2.h b/sim/bfin/bfroms/bf526-0.2.h
new file mode 100644
index 00000000000..5315b625f4a
--- /dev/null
+++ b/sim/bfin/bfroms/bf526-0.2.h
@@ -0,0 +1,4 @@
+/* DO NOT EDIT: Autogenerated.  */
+static const char bfrom_bf526_0_2[] =
+{
+};
diff --git a/sim/bfin/bfroms/bf54x-0.4.h b/sim/bfin/bfroms/bf54x-0.4.h
new file mode 100644
index 00000000000..e1f38fff1f9
--- /dev/null
+++ b/sim/bfin/bfroms/bf54x-0.4.h
@@ -0,0 +1,4 @@
+/* DO NOT EDIT: Autogenerated.  */
+static const char bfrom_bf54x_0_4[] =
+{
+};
diff --git a/sim/bfin/bfroms/bf54x_l1-0.4.h b/sim/bfin/bfroms/bf54x_l1-0.4.h
new file mode 100644
index 00000000000..eabc65bc596
--- /dev/null
+++ b/sim/bfin/bfroms/bf54x_l1-0.4.h
@@ -0,0 +1,4 @@
+/* DO NOT EDIT: Autogenerated.  */
+static const char bfrom_bf54x_l1_0_4[] =
+{
+};
diff --git a/sim/bfin/machs.c b/sim/bfin/machs.c
index 0c6e6f38fb5..4a012bf9d93 100644
--- a/sim/bfin/machs.c
+++ b/sim/bfin/machs.c
@@ -902,6 +902,7 @@ static const struct bfrom bf51x_roms[] =
 };
 static const struct bfrom bf526_roms[] =
 {
+  BFROM (526, 2, 0x1000000),
   BFROM (526, 1, 0x1000000),
   BFROM (526, 0, 0x1000000),
   BFROM_STUB,
@@ -943,9 +944,11 @@ static const struct bfrom bf538_roms[] =
 };
 static const struct bfrom bf54x_roms[] =
 {
+  BFROM (54x, 4, 0),
   BFROM (54x, 2, 0),
   BFROM (54x, 1, 0),
   BFROM (54x, 0, 0),
+  BFROMA (0xffa14000, 54x_l1, 4, 0),
   BFROMA (0xffa14000, 54x_l1, 2, 0),
   BFROMA (0xffa14000, 54x_l1, 1, 0),
   BFROMA (0xffa14000, 54x_l1, 0, 0),