summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2015-07-24 17:33:27 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2015-07-24 20:43:48 +0100
commitc651b54aa769dd02601d4377e72a1cf15fc50769 (patch)
tree83a961240291de8d747040be635f94e01961080a
parentf616bc7a44f748fa02abf8780ca0f6c4f38d30b5 (diff)
downloadvexpress-firmware-armlt-vexpress-15.08.tar.gz
Change SOFTWARE layout to reflect Juno changesarmlt-vexpress-15.08armlt-vexpress-15.07
The SOFTWARE directory has been re-organised in response to changes I made for Juno R0/R1, where the images.txt provides a translation from multiple files on the uSD card to the same names in NOR flash. This uses the NORxNAME parameter in images.txt. Presently, A5, A9 and TC1 are not really supported, so they use the old binaries that they've always used. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--SITE1/HBI0191B/images.txt39
-rw-r--r--SITE1/HBI0225B/images.txt35
-rw-r--r--SITE1/HBI0237A/images.txt35
-rw-r--r--SITE1/HBI0249A/images.txt11
-rw-r--r--SOFTWARE/TC2/board.dtbbin15059 -> 0 bytes
-rw-r--r--SOFTWARE/TC2/bootscr.txt5
-rw-r--r--SOFTWARE/a5.dtb (renamed from SOFTWARE/TC2/ramdisk.img)0
-rw-r--r--SOFTWARE/a9.dtb (renamed from SOFTWARE/TC2/zImage)0
-rw-r--r--SOFTWARE/boot-a5.bin (renamed from SOFTWARE/A5/uefi.bin)bin2621440 -> 2621440 bytes
-rw-r--r--SOFTWARE/boot-a9.bin (renamed from SOFTWARE/A9/uefi.bin)bin2621440 -> 2621440 bytes
-rw-r--r--SOFTWARE/boot-tc1.bin (renamed from SOFTWARE/TC1/uefi.bin)bin2621440 -> 2621440 bytes
-rw-r--r--SOFTWARE/boot-tc2.bin (renamed from SOFTWARE/TC2/boot.bin)bin786432 -> 786432 bytes
-rw-r--r--SOFTWARE/bootscr.txt5
-rw-r--r--SOFTWARE/ramdisk.img0
-rw-r--r--SOFTWARE/tc1.dtb0
-rw-r--r--SOFTWARE/tc2.dtb0
-rw-r--r--SOFTWARE/zImage0
17 files changed, 106 insertions, 24 deletions
diff --git a/SITE1/HBI0191B/images.txt b/SITE1/HBI0191B/images.txt
index 7072499..7cc16d6 100644
--- a/SITE1/HBI0191B/images.txt
+++ b/SITE1/HBI0191B/images.txt
@@ -1,9 +1,36 @@
TITLE: Versatile Express Images Configuration File
[IMAGES]
-TOTALIMAGES: 1 ;Number of Images (Max : 32)
-NOR0UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
-NOR0ADDRESS: 44000000 ;Image Flash Address
-NOR0FILE: \SOFTWARE\A9\uefi.bin ;Image File Name
-NOR0LOAD: 44000000 ;Image Load Address
-NOR0ENTRY: 44000000 ;Image Entry Point
+TOTALIMAGES: 5 ;Number of Images (Max : 32)
+NOR0UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR0ADDRESS: 44000000 ;Image Flash Address
+NOR0NAME: boot.bin
+NOR0FILE: \SOFTWARE\boot-a9.bin ;Image File Name
+NOR0LOAD: 44000000 ;Image Load Address
+NOR0ENTRY: 44000000 ;Image Entry Point
+
+NOR1UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR1ADDRESS: 03000000 ;Image Flash Address
+NOR1FILE: \SOFTWARE\zImage ;Image File Name - master kernel
+NOR1LOAD: 80008000 ;Image Load Address
+NOR1ENTRY: 80008000 ;Image Entry Point
+
+NOR2UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR2ADDRESS: 00600000 ;Image Flash Address
+NOR2NAME: ramdisk.img
+NOR2FILE: \SOFTWARE\ramdisk.img ;Image File Name - master initrd
+NOR2LOAD: a0100000 ;Image Load Address
+NOR2ENTRY: a0100000 ;Image Entry Point
+
+NOR3UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR3ADDRESS: 0c000000 ;Image Flash Address
+NOR3NAME: board.dtb
+NOR3FILE: \SOFTWARE\a9.dtb ;Image File Name - master DTB
+NOR3LOAD: a0000000 ;Image Load Address
+NOR3ENTRY: a0000000 ;Image Load Address
+
+NOR4UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR4ADDRESS: 0ffc0000 ;Image Flash Address
+NOR4FILE: \SOFTWARE\blank.img ;Image File Name
+NOR4LOAD: 00000000 ;Image Load Address
+NOR4ENTRY: 00000000 ;Image Entry Point
diff --git a/SITE1/HBI0225B/images.txt b/SITE1/HBI0225B/images.txt
index f1691aa..9d995ca 100644
--- a/SITE1/HBI0225B/images.txt
+++ b/SITE1/HBI0225B/images.txt
@@ -1,7 +1,34 @@
TITLE: Versatile Express Images Configuration File
[IMAGES]
-TOTALIMAGES: 1 ;Number of Images (Max : 32)
-NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE
-NOR0ADDRESS: BOOT ;Image Flash Address
-NOR0FILE: \SOFTWARE\A5\uefi.bin ;Image File Name
+TOTALIMAGES: 5 ;Number of Images (Max : 32)
+NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE
+NOR0ADDRESS: BOOT ;Image Flash Address
+NOR0NAME: boot.bin
+NOR0FILE: \SOFTWARE\boot-a5.bin ;Image File Name
+
+NOR1UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR1ADDRESS: 03000000 ;Image Flash Address
+NOR1FILE: \SOFTWARE\zImage ;Image File Name - master kernel
+NOR1LOAD: 80008000 ;Image Load Address
+NOR1ENTRY: 80008000 ;Image Entry Point
+
+NOR2UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR2ADDRESS: 00600000 ;Image Flash Address
+NOR2NAME: ramdisk.img
+NOR2FILE: \SOFTWARE\ramdisk.img ;Image File Name - master initrd
+NOR2LOAD: a0100000 ;Image Load Address
+NOR2ENTRY: a0100000 ;Image Entry Point
+
+NOR3UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR3ADDRESS: 0c000000 ;Image Flash Address
+NOR3NAME: board.dtb
+NOR3FILE: \SOFTWARE\a5.dtb ;Image File Name - master DTB
+NOR3LOAD: a0000000 ;Image Load Address
+NOR3ENTRY: a0000000 ;Image Load Address
+
+NOR4UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR4ADDRESS: 0ffc0000 ;Image Flash Address
+NOR4FILE: \SOFTWARE\blank.img ;Image File Name
+NOR4LOAD: 00000000 ;Image Load Address
+NOR4ENTRY: 00000000 ;Image Entry Point
diff --git a/SITE1/HBI0237A/images.txt b/SITE1/HBI0237A/images.txt
index 58c0c0d..7afd2de 100644
--- a/SITE1/HBI0237A/images.txt
+++ b/SITE1/HBI0237A/images.txt
@@ -1,7 +1,34 @@
TITLE: Versatile Express Images Configuration File
[IMAGES]
-TOTALIMAGES: 1 ;Number of Images (Max : 32)
-NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE
-NOR0ADDRESS: BOOT ;Image Flash Address
-NOR0FILE: \SOFTWARE\TC1\uefi.bin ;Image File Name
+TOTALIMAGES: 5 ;Number of Images (Max : 32)
+NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE
+NOR0ADDRESS: BOOT ;Image Flash Address
+NOR0NAME: boot.bin
+NOR0FILE: \SOFTWARE\boot-tc1.bin ;Image File Name
+
+NOR1UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR1ADDRESS: 03000000 ;Image Flash Address
+NOR1FILE: \SOFTWARE\zImage ;Image File Name - master kernel
+NOR1LOAD: 80008000 ;Image Load Address
+NOR1ENTRY: 80008000 ;Image Entry Point
+
+NOR2UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR2ADDRESS: 00600000 ;Image Flash Address
+NOR2NAME: ramdisk.img
+NOR2FILE: \SOFTWARE\ramdisk.img ;Image File Name - master initrd
+NOR2LOAD: a0100000 ;Image Load Address
+NOR2ENTRY: a0100000 ;Image Entry Point
+
+NOR3UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR3ADDRESS: 0c000000 ;Image Flash Address
+NOR3NAME: board.dtb
+NOR3FILE: \SOFTWARE\tc2.dtb ;Image File Name - master DTB
+NOR3LOAD: a0000000 ;Image Load Address
+NOR3ENTRY: a0000000 ;Image Load Address
+
+NOR4UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
+NOR4ADDRESS: 0ffc0000 ;Image Flash Address
+NOR4FILE: \SOFTWARE\blank.img ;Image File Name
+NOR4LOAD: 00000000 ;Image Load Address
+NOR4ENTRY: 00000000 ;Image Entry Point
diff --git a/SITE1/HBI0249A/images.txt b/SITE1/HBI0249A/images.txt
index 5e3213f..cb3df6a 100644
--- a/SITE1/HBI0249A/images.txt
+++ b/SITE1/HBI0249A/images.txt
@@ -9,31 +9,32 @@ NOR0FILE: \SOFTWARE\bm_v522r.axf ;Image File Name
NOR1UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
NOR1ADDRESS: 00000000 ;Image Flash Address
NOR1NAME: BOOTSCRIPT ;Image Flash Name
-NOR1FILE: \SOFTWARE\TC2\bootscr.txt ;Image File Name
+NOR1FILE: \SOFTWARE\bootscr.txt ;Image File Name
NOR2UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
NOR2ADDRESS: 03000000 ;Image Flash Address
-NOR2FILE: \SOFTWARE\TC2\zImage ;Image File Name - master kernel
+NOR2FILE: \SOFTWARE\zImage ;Image File Name - master kernel
NOR2LOAD: 80008000 ;Image Load Address
NOR2ENTRY: 80008000 ;Image Entry Point
NOR3UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
NOR3ADDRESS: 00600000 ;Image Flash Address
NOR3NAME: ramdisk.img
-NOR3FILE: \SOFTWARE\TC2\ramdisk.img ;Image File Name - master initrd
+NOR3FILE: \SOFTWARE\ramdisk.img ;Image File Name - master initrd
NOR3LOAD: a0100000 ;Image Load Address
NOR3ENTRY: a0100000 ;Image Entry Point
NOR4UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
NOR4ADDRESS: 0c000000 ;Image Flash Address
NOR4NAME: board.dtb
-NOR4FILE: \SOFTWARE\TC2\board.dtb ;Image File Name - master DTB
+NOR4FILE: \SOFTWARE\tc2.dtb ;Image File Name - master DTB
NOR4LOAD: a0000000 ;Image Load Address
NOR4ENTRY: a0000000 ;Image Load Address
NOR5UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
NOR5ADDRESS: 0d000000 ;Image Flash Address
-NOR5FILE: \SOFTWARE\TC2\boot.bin ;Image File Name
+NOR5NAME: boot.bin
+NOR5FILE: \SOFTWARE\boot-tc2.bin ;Image File Name
NOR5LOAD: b0000000 ;Image Load Address
NOR5ENTRY: b0000000 ;Image Entry Point
diff --git a/SOFTWARE/TC2/board.dtb b/SOFTWARE/TC2/board.dtb
deleted file mode 100644
index 7cff51c..0000000
--- a/SOFTWARE/TC2/board.dtb
+++ /dev/null
Binary files differ
diff --git a/SOFTWARE/TC2/bootscr.txt b/SOFTWARE/TC2/bootscr.txt
deleted file mode 100644
index 19e66ac..0000000
--- a/SOFTWARE/TC2/bootscr.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-flash run boot
-
-# fl linux fdt dtb
-# fl linux initrd initrd
-# fl linux boot zimage console=tty0 console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro androidboot.console=ttyAMA0 mmci.fmax=12000000
diff --git a/SOFTWARE/TC2/ramdisk.img b/SOFTWARE/a5.dtb
index e69de29..e69de29 100644
--- a/SOFTWARE/TC2/ramdisk.img
+++ b/SOFTWARE/a5.dtb
diff --git a/SOFTWARE/TC2/zImage b/SOFTWARE/a9.dtb
index e69de29..e69de29 100644
--- a/SOFTWARE/TC2/zImage
+++ b/SOFTWARE/a9.dtb
diff --git a/SOFTWARE/A5/uefi.bin b/SOFTWARE/boot-a5.bin
index 7c589d4..7c589d4 100644
--- a/SOFTWARE/A5/uefi.bin
+++ b/SOFTWARE/boot-a5.bin
Binary files differ
diff --git a/SOFTWARE/A9/uefi.bin b/SOFTWARE/boot-a9.bin
index adbbb15..adbbb15 100644
--- a/SOFTWARE/A9/uefi.bin
+++ b/SOFTWARE/boot-a9.bin
Binary files differ
diff --git a/SOFTWARE/TC1/uefi.bin b/SOFTWARE/boot-tc1.bin
index 217a576..217a576 100644
--- a/SOFTWARE/TC1/uefi.bin
+++ b/SOFTWARE/boot-tc1.bin
Binary files differ
diff --git a/SOFTWARE/TC2/boot.bin b/SOFTWARE/boot-tc2.bin
index 9bd4fa4..9bd4fa4 100644
--- a/SOFTWARE/TC2/boot.bin
+++ b/SOFTWARE/boot-tc2.bin
Binary files differ
diff --git a/SOFTWARE/bootscr.txt b/SOFTWARE/bootscr.txt
new file mode 100644
index 0000000..7289a54
--- /dev/null
+++ b/SOFTWARE/bootscr.txt
@@ -0,0 +1,5 @@
+flash run boot.bin
+
+# fl linux fdt board.dtb
+# fl linux initrd ramdisk.img
+# fl linux boot zImage console=ttyAMA0,38400 earlyprintk debug verbose rootwait root=/dev/sda2 androidboot.hardware=arm-versatileexpress-usb
diff --git a/SOFTWARE/ramdisk.img b/SOFTWARE/ramdisk.img
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SOFTWARE/ramdisk.img
diff --git a/SOFTWARE/tc1.dtb b/SOFTWARE/tc1.dtb
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SOFTWARE/tc1.dtb
diff --git a/SOFTWARE/tc2.dtb b/SOFTWARE/tc2.dtb
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SOFTWARE/tc2.dtb
diff --git a/SOFTWARE/zImage b/SOFTWARE/zImage
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SOFTWARE/zImage