From e28b013cebcc708813461c013ba80aa3d81007c4 Mon Sep 17 00:00:00 2001
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Tue, 26 Feb 2019 13:47:23 -0800
Subject: [PATCH] boundary: bootscripts: add i.MX6ULL support
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
board/boundary/bootscripts/bootscript-mainline.txt | 4 +++-
board/boundary/bootscripts/bootscript-ubuntu.txt | 4 +++-
board/boundary/bootscripts/bootscript-yocto.txt | 4 +++-
board/boundary/bootscripts/net_upgrade_fs.txt | 2 +-
board/boundary/bootscripts/net_upgradeu.txt | 2 +-
board/boundary/bootscripts/net_upgradeu_fs.txt | 2 +-
board/boundary/bootscripts/upgrade.txt | 2 +-
7 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/board/boundary/bootscripts/bootscript-mainline.txt b/board/boundary/bootscripts/bootscript-mainline.txt
index 384ae1324ff..cbb8e5bdf84 100644
--- a/board/boundary/bootscripts/bootscript-mainline.txt
+++ b/board/boundary/bootscripts/bootscript-mainline.txt
@@ -8,7 +8,7 @@ if itest.s x51 == "x${imx_cpu}" ; then
a_base=0x90000000
elif itest.s x53 == "x${imx_cpu}"; then
a_base=0x70000000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
a_base=0x80000000
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}"; then
a_base=0x40000000
@@ -38,6 +38,8 @@ if itest.s "x" == "x${fdt_file}" ; then
fdt_file=imx6qp-${board}.dtb;
elif itest.s x6SX == "x${imx_cpu}" ; then
fdt_file=imx6sx-${board}.dtb;
+ elif itest.s x6ULL == "x${imx_cpu}" ; then
+ fdt_file=imx6ull-${board}.dtb;
elif itest.s x7D == "x${imx_cpu}" ; then
fdt_file=imx7d-${board}.dtb;
elif itest.s x8MQ == "x${imx_cpu}" ; then
diff --git a/board/boundary/bootscripts/bootscript-ubuntu.txt b/board/boundary/bootscripts/bootscript-ubuntu.txt
index 7139c7176a3..5b744ea293d 100644
--- a/board/boundary/bootscripts/bootscript-ubuntu.txt
+++ b/board/boundary/bootscripts/bootscript-ubuntu.txt
@@ -9,7 +9,7 @@ if itest.s x51 == "x${imx_cpu}" ; then
a_base=0x90000000
elif itest.s x53 == "x${imx_cpu}"; then
a_base=0x70000000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
a_base=0x80000000
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}"; then
a_base=0x40000000
@@ -43,6 +43,8 @@ if itest.s "x" == "x${fdt_file}" ; then
fdt_file=imx6qp-${board}.dtb;
elif itest.s x6SX == "x${imx_cpu}" ; then
fdt_file=imx6sx-${board}${m4}.dtb;
+ elif itest.s x6ULL == "x${imx_cpu}" ; then
+ fdt_file=imx6ull-${board}.dtb;
elif itest.s x7D == "x${imx_cpu}" ; then
fdt_file=imx7d-${board}${m4}.dtb;
elif itest.s x8MQ == "x${imx_cpu}" ; then
diff --git a/board/boundary/bootscripts/bootscript-yocto.txt b/board/boundary/bootscripts/bootscript-yocto.txt
index c6d64d3bb24..8f1d6b89ca1 100644
--- a/board/boundary/bootscripts/bootscript-yocto.txt
+++ b/board/boundary/bootscripts/bootscript-yocto.txt
@@ -9,7 +9,7 @@ if itest.s x51 == "x${imx_cpu}" ; then
a_base=0x90000000
elif itest.s x53 == "x${imx_cpu}"; then
a_base=0x70000000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
a_base=0x80000000
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}"; then
a_base=0x40000000
@@ -43,6 +43,8 @@ if itest.s "x" == "x${fdt_file}" ; then
fdt_file=imx6qp-${board}.dtb;
elif itest.s x6SX == "x${imx_cpu}" ; then
fdt_file=imx6sx-${board}${m4}.dtb;
+ elif itest.s x6ULL == "x${imx_cpu}" ; then
+ fdt_file=imx6ull-${board}.dtb;
elif itest.s x7D == "x${imx_cpu}" ; then
fdt_file=imx7d-${board}${m4}.dtb;
elif itest.s x8MQ == "x${imx_cpu}" ; then
diff --git a/board/boundary/bootscripts/net_upgrade_fs.txt b/board/boundary/bootscripts/net_upgrade_fs.txt
index a28875f83bf..5fa85b05d77 100644
--- a/board/boundary/bootscripts/net_upgrade_fs.txt
+++ b/board/boundary/bootscripts/net_upgrade_fs.txt
@@ -10,7 +10,7 @@ if itest.s x51 == "x${imx_cpu}"; then
a_base=0x90200000
elif itest.s x53 == "x${imx_cpu}"; then
a_base=0x70200000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
a_base=0x80200000
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}"; then
a_base=0x40200000
diff --git a/board/boundary/bootscripts/net_upgradeu.txt b/board/boundary/bootscripts/net_upgradeu.txt
index 6b16fb63733..12ddea71e03 100644
--- a/board/boundary/bootscripts/net_upgradeu.txt
+++ b/board/boundary/bootscripts/net_upgradeu.txt
@@ -21,7 +21,7 @@ if itest.s x51 == "x${imx_cpu}"; then
a_base=0x90100000
elif itest.s x53 == "x${imx_cpu}"; then
a_base=0x70100000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
a_base=0x80100000
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}"; then
a_base=0x42000000
diff --git a/board/boundary/bootscripts/net_upgradeu_fs.txt b/board/boundary/bootscripts/net_upgradeu_fs.txt
index 7d15d5819ea..cc24421b128 100644
--- a/board/boundary/bootscripts/net_upgradeu_fs.txt
+++ b/board/boundary/bootscripts/net_upgradeu_fs.txt
@@ -5,7 +5,7 @@
setenv a_script
a_script=0x1000c000
-if itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+if itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
a_script=0x8000c000
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}"; then
a_script=0x4000c000
diff --git a/board/boundary/bootscripts/upgrade.txt b/board/boundary/bootscripts/upgrade.txt
index 1df452b989b..be11fc9f03a 100644
--- a/board/boundary/bootscripts/upgrade.txt
+++ b/board/boundary/bootscripts/upgrade.txt
@@ -13,7 +13,7 @@ if itest.s x51 == "x${imx_cpu}"; then
a_base=0x92000000
elif itest.s x53 == "x${imx_cpu}"; then
a_base=0x72000000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
a_base=0x82000000
elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}"; then
a_base=0x42000000
--
GitLab