android x15 lcr: update for 4.14 and FIT image support

1. not flash environment partition
2. use boot_fit.img instead of boot.img

Change-Id: Ifb3bd08359d9cb5cf66bd9725885282c7aba45aa
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

35 files changed, 35 insertions, 105 deletions

diff --git a/android/x15-v2/template-andebenchpro2015.yaml b/android/x15-v2/template-andebenchpro2015.yaml
index eb0d550..1cc92f0 100644
--- a/android/x15-v2/template-andebenchpro2015.yaml
+++ b/android/x15-v2/template-andebenchpro2015.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-antutu6.yaml b/android/x15-v2/template-antutu6.yaml
index 28233c4..d19fcea 100644
--- a/android/x15-v2/template-antutu6.yaml
+++ b/android/x15-v2/template-antutu6.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-benchmarkpi.yaml b/android/x15-v2/template-benchmarkpi.yaml
index 3bd633e..d099f34 100644
--- a/android/x15-v2/template-benchmarkpi.yaml
+++ b/android/x15-v2/template-benchmarkpi.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-boottime.yaml b/android/x15-v2/template-boottime.yaml
index 02e55a6..1f1b06d 100644
--- a/android/x15-v2/template-boottime.yaml
+++ b/android/x15-v2/template-boottime.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-caffeinemark.yaml b/android/x15-v2/template-caffeinemark.yaml
index 5dd091d..3aaed62 100644
--- a/android/x15-v2/template-caffeinemark.yaml
+++ b/android/x15-v2/template-caffeinemark.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cf-bench.yaml b/android/x15-v2/template-cf-bench.yaml
index e1cee75..a251275 100644
--- a/android/x15-v2/template-cf-bench.yaml
+++ b/android/x15-v2/template-cf-bench.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-focused1-v7a.yaml b/android/x15-v2/template-cts-focused1-v7a.yaml
index 4fe797e..b0b7626 100644
--- a/android/x15-v2/template-cts-focused1-v7a.yaml
+++ b/android/x15-v2/template-cts-focused1-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-focused2-v7a.yaml b/android/x15-v2/template-cts-focused2-v7a.yaml
index 88de013..cb416f5 100644
--- a/android/x15-v2/template-cts-focused2-v7a.yaml
+++ b/android/x15-v2/template-cts-focused2-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-media-v7a.yaml b/android/x15-v2/template-cts-media-v7a.yaml
index 29fb41d..b5f146c 100644
--- a/android/x15-v2/template-cts-media-v7a.yaml
+++ b/android/x15-v2/template-cts-media-v7a.yaml
@@ -76,10 +76,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-media2-v7a.yaml b/android/x15-v2/template-cts-media2-v7a.yaml
index be34d9d..bc596a3 100644
--- a/android/x15-v2/template-cts-media2-v7a.yaml
+++ b/android/x15-v2/template-cts-media2-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-opengl-v7a.yaml b/android/x15-v2/template-cts-opengl-v7a.yaml
index 7aecff1..1ef3d29 100644
--- a/android/x15-v2/template-cts-opengl-v7a.yaml
+++ b/android/x15-v2/template-cts-opengl-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-part1-v7a.yaml b/android/x15-v2/template-cts-part1-v7a.yaml
index 431019d..05ea83c 100644
--- a/android/x15-v2/template-cts-part1-v7a.yaml
+++ b/android/x15-v2/template-cts-part1-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-part2-v7a.yaml b/android/x15-v2/template-cts-part2-v7a.yaml
index 5da1989..520fac0 100644
--- a/android/x15-v2/template-cts-part2-v7a.yaml
+++ b/android/x15-v2/template-cts-part2-v7a.yaml
@@ -76,10 +76,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-part3-v7a.yaml b/android/x15-v2/template-cts-part3-v7a.yaml
index 99451a9..a719670 100644
--- a/android/x15-v2/template-cts-part3-v7a.yaml
+++ b/android/x15-v2/template-cts-part3-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-part4-v7a.yaml b/android/x15-v2/template-cts-part4-v7a.yaml
index 9cb0eff..bde6b8b 100644
--- a/android/x15-v2/template-cts-part4-v7a.yaml
+++ b/android/x15-v2/template-cts-part4-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-cts-part5-v7a.yaml b/android/x15-v2/template-cts-part5-v7a.yaml
index aa63dba..ae624c8 100644
--- a/android/x15-v2/template-cts-part5-v7a.yaml
+++ b/android/x15-v2/template-cts-part5-v7a.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-gearses2eclair.yaml b/android/x15-v2/template-gearses2eclair.yaml
index 24b62a3..f6ee2b0 100644
--- a/android/x15-v2/template-gearses2eclair.yaml
+++ b/android/x15-v2/template-gearses2eclair.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-geekbench3.yaml b/android/x15-v2/template-geekbench3.yaml
index f8a5cfc..171bddd 100644
--- a/android/x15-v2/template-geekbench3.yaml
+++ b/android/x15-v2/template-geekbench3.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-glbenchmark25.yaml b/android/x15-v2/template-glbenchmark25.yaml
index 47bbccb..5e7b7a4 100644
--- a/android/x15-v2/template-glbenchmark25.yaml
+++ b/android/x15-v2/template-glbenchmark25.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-javawhetstone.yaml b/android/x15-v2/template-javawhetstone.yaml
index 7d59815..d47aa10 100644
--- a/android/x15-v2/template-javawhetstone.yaml
+++ b/android/x15-v2/template-javawhetstone.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-jbench.yaml b/android/x15-v2/template-jbench.yaml
index dca29d7..1b72238 100644
--- a/android/x15-v2/template-jbench.yaml
+++ b/android/x15-v2/template-jbench.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-linpack.yaml b/android/x15-v2/template-linpack.yaml
index 1b8cbbb..b7c329b 100644
--- a/android/x15-v2/template-linpack.yaml
+++ b/android/x15-v2/template-linpack.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-monkey.yaml b/android/x15-v2/template-monkey.yaml
index d6a40bd..32f4746 100644
--- a/android/x15-v2/template-monkey.yaml
+++ b/android/x15-v2/template-monkey.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-quadrantpro.yaml b/android/x15-v2/template-quadrantpro.yaml
index cff5725..7821dd5 100644
--- a/android/x15-v2/template-quadrantpro.yaml
+++ b/android/x15-v2/template-quadrantpro.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-rl-sqlite.yaml b/android/x15-v2/template-rl-sqlite.yaml
index bdeac9d..59e0032 100644
--- a/android/x15-v2/template-rl-sqlite.yaml
+++ b/android/x15-v2/template-rl-sqlite.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-scimark.yaml b/android/x15-v2/template-scimark.yaml
index 39dc16f..c0707f8 100644
--- a/android/x15-v2/template-scimark.yaml
+++ b/android/x15-v2/template-scimark.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-vellamo3.yaml b/android/x15-v2/template-vellamo3.yaml
index 914595d..a454688 100644
--- a/android/x15-v2/template-vellamo3.yaml
+++ b/android/x15-v2/template-vellamo3.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-vts-part1.yaml b/android/x15-v2/template-vts-part1.yaml
index ede1a8c..b45efb2 100644
--- a/android/x15-v2/template-vts-part1.yaml
+++ b/android/x15-v2/template-vts-part1.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-vts-part2.yaml b/android/x15-v2/template-vts-part2.yaml
index f0dd251..cad08aa 100644
--- a/android/x15-v2/template-vts-part2.yaml
+++ b/android/x15-v2/template-vts-part2.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-vts-part3.yaml b/android/x15-v2/template-vts-part3.yaml
index e465116..d45bcde 100644
--- a/android/x15-v2/template-vts-part3.yaml
+++ b/android/x15-v2/template-vts-part3.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-vts-part4.yaml b/android/x15-v2/template-vts-part4.yaml
index b5cdd1d..303fb1e 100644
--- a/android/x15-v2/template-vts-part4.yaml
+++ b/android/x15-v2/template-vts-part4.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-vts-part5.yaml b/android/x15-v2/template-vts-part5.yaml
index 5b2cc4e..c83a10d 100644
--- a/android/x15-v2/template-vts-part5.yaml
+++ b/android/x15-v2/template-vts-part5.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-vts-part6.yaml b/android/x15-v2/template-vts-part6.yaml
index 52a45d0..211bf9c 100644
--- a/android/x15-v2/template-vts-part6.yaml
+++ b/android/x15-v2/template-vts-part6.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template-weekly.yaml b/android/x15-v2/template-weekly.yaml
index 90a0db2..74ba0a0 100644
--- a/android/x15-v2/template-weekly.yaml
+++ b/android/x15-v2/template-weekly.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata:
diff --git a/android/x15-v2/template.yaml b/android/x15-v2/template.yaml
index 48c2c24..30ecfcd 100644
--- a/android/x15-v2/template.yaml
+++ b/android/x15-v2/template.yaml
@@ -74,10 +74,8 @@ actions:
     to: fastboot
     namespace: droid
     images:
-      environment:
-        url: "%%DOWNLOAD_URL%%/am57xx-evm-reva3.dtb"
       boot:
-        url: "%%ANDROID_BOOT%%"
+        url: "%%DOWNLOAD_URL%%boot_fit.img"
       cache:
         url: "%%ANDROID_CACHE%%"
       userdata: