From 2f57ae0924a1c72f7541b3aa6b8dde309b64409a Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Tue, 30 Jun 2015 14:33:14 +0100 Subject: tc2: change filenames used in images.txt Re-org the files in images.txt and SOFTWARE so that the output of the new Platforms releases [1] can be overlayed directly into the SOFTWARE/TC2 directory. The files are also re-org'd in the memory map to acount for how ARM BDS in UEFI loads images. The kernel zImage and ramdisk.img must live on the same boot device (i.e. the same NOR Flash bank). [1] releases.linaro.org/latest/members/arm/platforms releases.linaro.org/i15.07/members/arm/platforms Signed-off-by: Ryan Harkin --- SITE1/HBI0249A/images.txt | 14 ++++++++------ SOFTWARE/TC2/board.dtb | Bin 0 -> 15059 bytes SOFTWARE/TC2/boot.bin | Bin 0 -> 786432 bytes SOFTWARE/TC2/bootscr.txt | 2 +- SOFTWARE/TC2/dtb.bin | 0 SOFTWARE/TC2/initrd.bin | 0 SOFTWARE/TC2/ramdisk.img | 0 SOFTWARE/TC2/uefi.bin | Bin 753664 -> 0 bytes SOFTWARE/TC2/zImage | 0 SOFTWARE/TC2/zimage.bin | 0 10 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 SOFTWARE/TC2/board.dtb create mode 100644 SOFTWARE/TC2/boot.bin delete mode 100644 SOFTWARE/TC2/dtb.bin delete mode 100644 SOFTWARE/TC2/initrd.bin create mode 100644 SOFTWARE/TC2/ramdisk.img delete mode 100644 SOFTWARE/TC2/uefi.bin create mode 100644 SOFTWARE/TC2/zImage delete mode 100644 SOFTWARE/TC2/zimage.bin diff --git a/SITE1/HBI0249A/images.txt b/SITE1/HBI0249A/images.txt index fa95979..d51d471 100644 --- a/SITE1/HBI0249A/images.txt +++ b/SITE1/HBI0249A/images.txt @@ -13,25 +13,27 @@ NOR1FILE: \SOFTWARE\TC2\bootscr.txt ;Image File Name NOR2UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE NOR2ADDRESS: 0d000000 ;Image Flash Address -NOR2FILE: \SOFTWARE\TC2\uefi.bin ;Image File Name +NOR2FILE: \SOFTWARE\TC2\boot.bin ;Image File Name NOR2LOAD: b0000000 ;Image Load Address NOR2ENTRY: b0000000 ;Image Entry Point NOR3UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE NOR3ADDRESS: 03000000 ;Image Flash Address -NOR3FILE: \SOFTWARE\TC2\zimage.bin ;Image File Name - master kernel +NOR3FILE: \SOFTWARE\TC2\zImage ;Image File Name - master kernel NOR3LOAD: 80008000 ;Image Load Address NOR3ENTRY: 80008000 ;Image Entry Point NOR4UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE -NOR4ADDRESS: 00600000 ;Image Flash Address -NOR4FILE: \SOFTWARE\TC2\dtb.bin ;Image File Name - master DTB +NOR4ADDRESS: 0c000000 ;Image Flash Address +NOR4NAME: board.dtb +NOR4FILE: \SOFTWARE\TC2\board.dtb ;Image File Name - master DTB NOR4LOAD: a0000000 ;Image Load Address NOR4ENTRY: a0000000 ;Image Load Address NOR5UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE -NOR5ADDRESS: 0c000000 ;Image Flash Address -NOR5FILE: \SOFTWARE\TC2\initrd.bin ;Image File Name - master initrd +NOR5ADDRESS: 00600000 ;Image Flash Address +NOR5NAME: ramdisk.img +NOR5FILE: \SOFTWARE\TC2\ramdisk.img ;Image File Name - master initrd NOR5LOAD: a0100000 ;Image Load Address NOR5ENTRY: a0100000 ;Image Entry Point diff --git a/SOFTWARE/TC2/board.dtb b/SOFTWARE/TC2/board.dtb new file mode 100644 index 0000000..7cff51c Binary files /dev/null and b/SOFTWARE/TC2/board.dtb differ diff --git a/SOFTWARE/TC2/boot.bin b/SOFTWARE/TC2/boot.bin new file mode 100644 index 0000000..9bd4fa4 Binary files /dev/null and b/SOFTWARE/TC2/boot.bin differ diff --git a/SOFTWARE/TC2/bootscr.txt b/SOFTWARE/TC2/bootscr.txt index db87671..19e66ac 100644 --- a/SOFTWARE/TC2/bootscr.txt +++ b/SOFTWARE/TC2/bootscr.txt @@ -1,4 +1,4 @@ -flash run uefi +flash run boot # fl linux fdt dtb # fl linux initrd initrd diff --git a/SOFTWARE/TC2/dtb.bin b/SOFTWARE/TC2/dtb.bin deleted file mode 100644 index e69de29..0000000 diff --git a/SOFTWARE/TC2/initrd.bin b/SOFTWARE/TC2/initrd.bin deleted file mode 100644 index e69de29..0000000 diff --git a/SOFTWARE/TC2/ramdisk.img b/SOFTWARE/TC2/ramdisk.img new file mode 100644 index 0000000..e69de29 diff --git a/SOFTWARE/TC2/uefi.bin b/SOFTWARE/TC2/uefi.bin deleted file mode 100644 index a255ed2..0000000 Binary files a/SOFTWARE/TC2/uefi.bin and /dev/null differ diff --git a/SOFTWARE/TC2/zImage b/SOFTWARE/TC2/zImage new file mode 100644 index 0000000..e69de29 diff --git a/SOFTWARE/TC2/zimage.bin b/SOFTWARE/TC2/zimage.bin deleted file mode 100644 index e69de29..0000000 -- cgit v1.2.3