summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2016-06-14 10:42:36 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2016-06-22 13:56:17 +0100
commitbc1b018ea10f2832bd30388e6f84ea09c4bd1257 (patch)
tree77cd37868d84502c4ac3be1d46006584d973d9ce
parent31580bb7bd502c94946b936678b2befe6b09fe0f (diff)
downloadvexpress-firmware-bc1b018ea10f2832bd30388e6f84ea09c4bd1257.tar.gz
Rename the kernel in the SOFTWARE directory as Image, instead of zImage. We don't necessariily use a zImage, eg: when booting with bootmon, it's a zImage, when booting with u-boot, it will be a uImage. Also, set the norname for the kernel to "norkern" to match what we've done for Juno. Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--SITE1/HBI0191B/images.txt3
-rw-r--r--SITE1/HBI0225B/images.txt3
-rw-r--r--SITE1/HBI0237A/images.txt3
-rw-r--r--SITE1/HBI0249A/images.txt3
-rw-r--r--SOFTWARE/bootkern.txt2
5 files changed, 9 insertions, 5 deletions
diff --git a/SITE1/HBI0191B/images.txt b/SITE1/HBI0191B/images.txt
index 7cc16d6..28e5bb5 100644
--- a/SITE1/HBI0191B/images.txt
+++ b/SITE1/HBI0191B/images.txt
@@ -11,7 +11,8 @@ 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
+NOR1FILE: \SOFTWARE\Image ;Image File Name - master kernel
+NOR1NAME: norkern ;Rename kernel to norkern
NOR1LOAD: 80008000 ;Image Load Address
NOR1ENTRY: 80008000 ;Image Entry Point
diff --git a/SITE1/HBI0225B/images.txt b/SITE1/HBI0225B/images.txt
index 9d995ca..1351a23 100644
--- a/SITE1/HBI0225B/images.txt
+++ b/SITE1/HBI0225B/images.txt
@@ -9,7 +9,8 @@ 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
+NOR1FILE: \SOFTWARE\Image ;Image File Name - master kernel
+NOR1NAME: norkern ;Rename kernel to norkern
NOR1LOAD: 80008000 ;Image Load Address
NOR1ENTRY: 80008000 ;Image Entry Point
diff --git a/SITE1/HBI0237A/images.txt b/SITE1/HBI0237A/images.txt
index 7afd2de..1d81a2e 100644
--- a/SITE1/HBI0237A/images.txt
+++ b/SITE1/HBI0237A/images.txt
@@ -9,7 +9,8 @@ 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
+NOR1FILE: \SOFTWARE\Image ;Image File Name - master kernel
+NOR1NAME: norkern ;Rename kernel to norkern
NOR1LOAD: 80008000 ;Image Load Address
NOR1ENTRY: 80008000 ;Image Entry Point
diff --git a/SITE1/HBI0249A/images.txt b/SITE1/HBI0249A/images.txt
index cb3df6a..f5f312b 100644
--- a/SITE1/HBI0249A/images.txt
+++ b/SITE1/HBI0249A/images.txt
@@ -13,7 +13,8 @@ NOR1FILE: \SOFTWARE\bootscr.txt ;Image File Name
NOR2UPDATE: AUTO ;IMAGE UPDATE:NONE/AUTO/FORCE
NOR2ADDRESS: 03000000 ;Image Flash Address
-NOR2FILE: \SOFTWARE\zImage ;Image File Name - master kernel
+NOR2FILE: \SOFTWARE\Image ;Image File Name - master kernel
+NOR2NAME: norkern ;Rename kernel to norkern
NOR2LOAD: 80008000 ;Image Load Address
NOR2ENTRY: 80008000 ;Image Entry Point
diff --git a/SOFTWARE/bootkern.txt b/SOFTWARE/bootkern.txt
index d022a9d..d3fed5f 100644
--- a/SOFTWARE/bootkern.txt
+++ b/SOFTWARE/bootkern.txt
@@ -1,3 +1,3 @@
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
+fl linux boot norkern console=ttyAMA0,38400 earlyprintk debug verbose rootwait root=/dev/sda2 androidboot.hardware=arm-versatileexpress-usb