x15: deploy u-boot.img as well
since we generate the u-boot from source from ci as well
Change-Id: I6755c4bb8c1d2a30704bb361d2d78c226c8d2979
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/x15/template-andebenchpro2015.json b/android/x15/template-andebenchpro2015.json
index 0d27460..b5e9945 100644
--- a/android/x15/template-andebenchpro2015.json
+++ b/android/x15/template-andebenchpro2015.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-antutu6.0.json b/android/x15/template-antutu6.0.json
index 8300cfe..39813f6 100644
--- a/android/x15/template-antutu6.0.json
+++ b/android/x15/template-antutu6.0.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-applications.json b/android/x15/template-applications.json
index 0e6caed..e8a975b 100644
--- a/android/x15/template-applications.json
+++ b/android/x15/template-applications.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-benchmarkpi.json b/android/x15/template-benchmarkpi.json
index c452e28..de87a5a 100644
--- a/android/x15/template-benchmarkpi.json
+++ b/android/x15/template-benchmarkpi.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-boottime.json b/android/x15/template-boottime.json
index 90c4fb7..f4a33bb 100644
--- a/android/x15/template-boottime.json
+++ b/android/x15/template-boottime.json
@@ -11,6 +11,18 @@
{
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-caffeinemark.json b/android/x15/template-caffeinemark.json
index c8f3aed..c6ecfc5 100644
--- a/android/x15/template-caffeinemark.json
+++ b/android/x15/template-caffeinemark.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cf-bench.json b/android/x15/template-cf-bench.json
index 661484c..6574e2f 100644
--- a/android/x15/template-cf-bench.json
+++ b/android/x15/template-cf-bench.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-focused1.json b/android/x15/template-cts-focused1.json
index 6398b71..e0720bf 100644
--- a/android/x15/template-cts-focused1.json
+++ b/android/x15/template-cts-focused1.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-focused2.json b/android/x15/template-cts-focused2.json
index 8a051ce..7172c9b 100644
--- a/android/x15/template-cts-focused2.json
+++ b/android/x15/template-cts-focused2.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-media.json b/android/x15/template-cts-media.json
index 9cafad0..22d297d 100644
--- a/android/x15/template-cts-media.json
+++ b/android/x15/template-cts-media.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-opengl.json b/android/x15/template-cts-opengl.json
index 60eb604..54f828f 100644
--- a/android/x15/template-cts-opengl.json
+++ b/android/x15/template-cts-opengl.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-part1.json b/android/x15/template-cts-part1.json
index 9c41fa3..d9e508d 100644
--- a/android/x15/template-cts-part1.json
+++ b/android/x15/template-cts-part1.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-part2.json b/android/x15/template-cts-part2.json
index bd7097e..a5a12a6 100644
--- a/android/x15/template-cts-part2.json
+++ b/android/x15/template-cts-part2.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-part3.json b/android/x15/template-cts-part3.json
index 601f113..164f1d3 100644
--- a/android/x15/template-cts-part3.json
+++ b/android/x15/template-cts-part3.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-cts-part4.json b/android/x15/template-cts-part4.json
index 0936c3a..69b8c21 100644
--- a/android/x15/template-cts-part4.json
+++ b/android/x15/template-cts-part4.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-gearses2eclair.json b/android/x15/template-gearses2eclair.json
index c610aa9..6f50411 100644
--- a/android/x15/template-gearses2eclair.json
+++ b/android/x15/template-gearses2eclair.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-geekbench3.json b/android/x15/template-geekbench3.json
index ad459c8..0f06991 100644
--- a/android/x15/template-geekbench3.json
+++ b/android/x15/template-geekbench3.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-glbenchmark-2.5.1.json b/android/x15/template-glbenchmark-2.5.1.json
index 0430af8..7a73f09 100644
--- a/android/x15/template-glbenchmark-2.5.1.json
+++ b/android/x15/template-glbenchmark-2.5.1.json
@@ -24,8 +24,20 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
- "url": "%%ANDROID_BOOT%%"
+ "url": "%%ANDROID_BOOT%%"
},
{
"partition": "system",
@@ -36,8 +48,8 @@
"url": "%%ANDROID_DATA%%"
},
{
- "partition": "system",
- "url": "%%ANDROID_SYSTEM%%"
+ "partition": "cache",
+ "url": "%%ANDROID_CACHE%%"
}
]
}
diff --git a/android/x15/template-javawhetstone.json b/android/x15/template-javawhetstone.json
index 1232498..c418d08 100644
--- a/android/x15/template-javawhetstone.json
+++ b/android/x15/template-javawhetstone.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-jbench.json b/android/x15/template-jbench.json
index fa2e48f..af18cea 100644
--- a/android/x15/template-jbench.json
+++ b/android/x15/template-jbench.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-linpack.json b/android/x15/template-linpack.json
index c325043..7b0cf18 100644
--- a/android/x15/template-linpack.json
+++ b/android/x15/template-linpack.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-quadrantpro.json b/android/x15/template-quadrantpro.json
index 9e5b115..04f700f 100644
--- a/android/x15/template-quadrantpro.json
+++ b/android/x15/template-quadrantpro.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-rl-sqlite.json b/android/x15/template-rl-sqlite.json
index 6776169..0e7106d 100644
--- a/android/x15/template-rl-sqlite.json
+++ b/android/x15/template-rl-sqlite.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-scimark.json b/android/x15/template-scimark.json
index ab9e8f2..abd0f4e 100644
--- a/android/x15/template-scimark.json
+++ b/android/x15/template-scimark.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-vellamo3.json b/android/x15/template-vellamo3.json
index 3eba3a5..e3bf25b 100644
--- a/android/x15/template-vellamo3.json
+++ b/android/x15/template-vellamo3.json
@@ -24,6 +24,18 @@
"bootloadertype": "uefi",
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template-weekly.json b/android/x15/template-weekly.json
index 7890d4f..2f97cd7 100644
--- a/android/x15/template-weekly.json
+++ b/android/x15/template-weekly.json
@@ -11,6 +11,18 @@
{
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},
diff --git a/android/x15/template.json b/android/x15/template.json
index ec06d70..34fd3ff 100644
--- a/android/x15/template.json
+++ b/android/x15/template.json
@@ -11,6 +11,18 @@
{
"images": [
{
+ "partition": "xloader",
+ "url": "%%DOWNLOAD_URL%%/MLO"
+ },
+ {
+ "partition": "bootloader",
+ "url": "%%DOWNLOAD_URL%%/u-boot.img"
+ },
+ {
+ "partition": "environment",
+ "url": "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
+ },
+ {
"partition": "boot",
"url": "%%ANDROID_BOOT%%"
},