summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2013-12-10 10:44:03 +0000
committerRyan Harkin <ryan.harkin@linaro.org>2013-12-10 10:44:03 +0000
commit7551bb49ddacd733e0b4fa978e0b3ff9d88830ef (patch)
treee613daf49c7d332ea0f16e92bcb57342cd148c5b
parent95d29c6ff83b5d1c05d049cc7e9431e9d8021f54 (diff)
parent3552e8f48400bb724319d0762e5a6a764c1ac85d (diff)
downloadvexpress-firmware-7551bb49ddacd733e0b4fa978e0b3ff9d88830ef.tar.gz
Merge branch 'arm-releases' into 'master'
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--MB/HBI0190D/board.txt2
-rw-r--r--MB/HBI0190D/mbb_v311.ebfbin186772 -> 0 bytes
-rw-r--r--MB/HBI0190D/mbb_v312.ebfbin0 -> 186788 bytes
-rw-r--r--SITE1/HBI0191B/board.txt2
-rw-r--r--SITE1/HBI0191B/dbb_v114.ebfbin20548 -> 0 bytes
-rw-r--r--SITE1/HBI0191B/dbb_v115.ebfbin0 -> 20644 bytes
-rw-r--r--SITE1/HBI0249A/board.txt40
-rw-r--r--SITE1/HBI0249A/dbb_v107.ebfbin29012 -> 0 bytes
-rw-r--r--SITE1/HBI0249A/images.txt2
-rw-r--r--SOFTWARE/bm_v522r.axf (renamed from SOFTWARE/bm_v519r.axf)bin199000 -> 200088 bytes
10 files changed, 22 insertions, 24 deletions
diff --git a/MB/HBI0190D/board.txt b/MB/HBI0190D/board.txt
index 6911210..bae71e2 100644
--- a/MB/HBI0190D/board.txt
+++ b/MB/HBI0190D/board.txt
@@ -2,7 +2,7 @@ BOARD: HBI0190
TITLE: MotherBoard Configuration File
[MCCS]
-MBBIOS: mbb_v311.ebf ;MB BIOS IMAGE
+MBBIOS: mbb_v312.ebf ;MB BIOS IMAGE
[FPGAS]
MBIOFPGA: io_b108.bit ;REQUIRED TO ALLOW UPDATE FROM VECD v1.x
diff --git a/MB/HBI0190D/mbb_v311.ebf b/MB/HBI0190D/mbb_v311.ebf
deleted file mode 100644
index d13470a..0000000
--- a/MB/HBI0190D/mbb_v311.ebf
+++ /dev/null
Binary files differ
diff --git a/MB/HBI0190D/mbb_v312.ebf b/MB/HBI0190D/mbb_v312.ebf
new file mode 100644
index 0000000..8f093e5
--- /dev/null
+++ b/MB/HBI0190D/mbb_v312.ebf
Binary files differ
diff --git a/SITE1/HBI0191B/board.txt b/SITE1/HBI0191B/board.txt
index 2c307ff..f58c355 100644
--- a/SITE1/HBI0191B/board.txt
+++ b/SITE1/HBI0191B/board.txt
@@ -5,7 +5,7 @@ TITLE: V2P-CA9 Configuration File
[DCCS]
TOTALDCCS: 1 ;(1) Total Number of DCCS - Do not change this value
-M0FILE: dbb_v114.ebf ;DCC0 Filename
+M0FILE: dbb_v115.ebf ;DCC0 Filename
M0MODE: MICRO ;DCC0 Programming Mode
[FPGAS]
diff --git a/SITE1/HBI0191B/dbb_v114.ebf b/SITE1/HBI0191B/dbb_v114.ebf
deleted file mode 100644
index a2ea329..0000000
--- a/SITE1/HBI0191B/dbb_v114.ebf
+++ /dev/null
Binary files differ
diff --git a/SITE1/HBI0191B/dbb_v115.ebf b/SITE1/HBI0191B/dbb_v115.ebf
new file mode 100644
index 0000000..defab99
--- /dev/null
+++ b/SITE1/HBI0191B/dbb_v115.ebf
Binary files differ
diff --git a/SITE1/HBI0249A/board.txt b/SITE1/HBI0249A/board.txt
index 2d3cf8f..67e73ba 100644
--- a/SITE1/HBI0249A/board.txt
+++ b/SITE1/HBI0249A/board.txt
@@ -35,27 +35,27 @@ OSC8: 50.0 ;DDR2 (8:1 - 400MHz)
[SCC REGISTERS]
TOTALSCCS: 32 ;Total Number of SCC registers
-
SCC: 0x01C 0xFF00FF00 ;CFGRW3 - SMC CS6/7 N/U
SCC: 0x118 0x01CD1011 ;CFGRW17 - HDLCD PLL external bypass
-SCC: 0x700 0x1032F003 ;CFGRW48 - [25:24]Boot CPU [28]Boot Cluster (default CA7_0)
- ; Bootmon configuration:
- ; [15]: A7 Event stream generation (default: disabled)
- ; [14]: A15 Event stream generation (default: disabled)
- ; [13]: Power down the non-boot cluster (default: disabled)
- ; [12]: Use per-cpu mailboxes for power management (default: disabled)
- ; [11]: A15 executes WFEs as nops (default: disabled)
- ; [ 4]: Erase UEFI variable storage in NOR flash
-SCC: 0x400 0x33330c00 ;CFGREG41 - A15 configuration register 0 (Default 0x33330c80)
- ; [29:28] SPNIDEN
- ; [25:24] SPIDEN
- ; [21:20] NIDEN
- ; [17:16] DBGEN
- ; [13:12] CFGTE
- ; [9:8] VINITHI_CORE
- ; [7] IMINLN
- ; [3:0] CLUSTER_ID
+SCC: 0x700 0x1032F003 ;CFGRW48 - Cluster configuration register (Default 0x0032F003)
+ ; [ 28] Boot Cluster (default CA15)
+ ; [25:24] Boot CPU (default 0)
+ ; [ 15] A7 Event stream generation (default: enabled)
+ ; [ 14] A15 Event stream generation (default: enabled)
+ ; [ 13] Power down the non-boot cluster (default: enabled)
+ ; [ 12] Use per-cpu mailboxes for power management (default: enabled)
+ ; [ 11] A15 executes WFEs as nops (default: disabled)
+
+SCC: 0x400 0x33330C00 ;CFGRW41 - A15 configuration register 0 (Default 0x33330C00)
+ ; [29:28] SPNIDEN
+ ; [25:24] SPIDEN
+ ; [21:20] NIDEN
+ ; [17:16] DBGEN
+ ; [13:12] CFGTE
+ ; [ 9: 8] VINITHI_CORE
+ ; [ 7] IMINLN
+ ; [ 3: 0] CLUSTER_ID
;Set the CPU clock PLLs
SCC: 0x120 0x022F1010 ;CFGRW19 - CA15_0 PLL control - 20:1 (lock OFF)
@@ -68,9 +68,7 @@ SCC: 0x138 0x022F1010 ;CFGRW25 - CA7_1 PLL control - 20:1 (lock OFF)
SCC: 0x13C 0x0011710D ;CFGRW26 - CA7_1 PLL value
;Power management interface
-;SCC: 0xC00 0x00000001 ;Control: [0]PMI_EN [1]DBG_EN [2]SPC_SYSCFG
-SCC: 0xC00 0x00000005 ;Control: [0]PMI_EN [1]DBG_EN [2]SPC_SYSCFG
-;SCC: 0xC04 0x000005DC ;Latency in uS max: [15:0]DVFS [31:16]PWRUP
+SCC: 0xC00 0x00000005 ;Control: [0]PMI_EN [1]DBG_EN [2]SPC_SYSCFG (disable DBG_EN for power measurements)
SCC: 0xC04 0x060E0356 ;Latency in uS max: [15:0]DVFS [31:16]PWRUP
SCC: 0xC08 0x00000000 ;Reserved
SCC: 0xC0C 0x00000000 ;Reserved
diff --git a/SITE1/HBI0249A/dbb_v107.ebf b/SITE1/HBI0249A/dbb_v107.ebf
deleted file mode 100644
index f26716b..0000000
--- a/SITE1/HBI0249A/dbb_v107.ebf
+++ /dev/null
Binary files differ
diff --git a/SITE1/HBI0249A/images.txt b/SITE1/HBI0249A/images.txt
index 42e318f..c5481cc 100644
--- a/SITE1/HBI0249A/images.txt
+++ b/SITE1/HBI0249A/images.txt
@@ -4,7 +4,7 @@ TITLE: Versatile Express Images Configuration File
TOTALIMAGES: 6 ;Number of Images (Max : 32)
NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE
NOR0ADDRESS: BOOT ;Image Flash Address
-NOR0FILE: \SOFTWARE\bm_v519r.axf ;Image File Name
+NOR0FILE: \SOFTWARE\bm_v522r.axf ;Image File Name
NOR1UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
NOR1ADDRESS: 00000000 ;Image Flash Address
diff --git a/SOFTWARE/bm_v519r.axf b/SOFTWARE/bm_v522r.axf
index 8956ab1..ee059b6 100644
--- a/SOFTWARE/bm_v519r.axf
+++ b/SOFTWARE/bm_v522r.axf
Binary files differ