From 5f2dad04f492b7b32139cc85e58a688e0001b28f Mon Sep 17 00:00:00 2001
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Tue, 19 Nov 2019 11:24:28 -0800
Subject: [PATCH] boundary: bootscripts: add 8MMQ/8MNano

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
 board/boundary/bootscripts/bootscript-mainline.txt | 6 +++++-
 board/boundary/bootscripts/bootscript-ubuntu.txt   | 6 +++++-
 board/boundary/bootscripts/bootscript-yocto.txt    | 6 +++++-
 board/boundary/bootscripts/image-gzwrite.txt       | 2 +-
 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 +-
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/board/boundary/bootscripts/bootscript-mainline.txt b/board/boundary/bootscripts/bootscript-mainline.txt
index efd7246abdc..378a655a471 100644
--- a/board/boundary/bootscripts/bootscript-mainline.txt
+++ b/board/boundary/bootscripts/bootscript-mainline.txt
@@ -10,7 +10,7 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x70000000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_base=0x40000000
 	kernelimage=Image
 	bootcommand=booti
@@ -46,6 +46,10 @@ if itest.s "x" == "x${fdt_file}" ; then
 		fdt_file=imx8mq-${board}.dtb;
 	elif itest.s x8MM == "x${imx_cpu}" ; then
 		fdt_file=imx8mm-${board}.dtb;
+	elif itest.s x8MMQ == "x${imx_cpu}" ; then
+		fdt_file=imx8mm-${board}.dtb;
+	elif itest.s x8MNano == "x${imx_cpu}" ; then
+		fdt_file=imx8mn-${board}.dtb;
 	elif itest.s x51 == "x${imx_cpu}" ; then
 		fdt_file=imx51-${board}.dtb;
 	elif itest.s x53 == "x${imx_cpu}" ; then
diff --git a/board/boundary/bootscripts/bootscript-ubuntu.txt b/board/boundary/bootscripts/bootscript-ubuntu.txt
index 422d545bb11..5d714df670d 100644
--- a/board/boundary/bootscripts/bootscript-ubuntu.txt
+++ b/board/boundary/bootscripts/bootscript-ubuntu.txt
@@ -12,7 +12,7 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x70000000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_base=0x40000000
 	kernelimage=Image
 	bootcommand=booti
@@ -53,6 +53,10 @@ if itest.s "x" == "x${fdt_file}" ; then
 		fdt_file=imx8mq-${board}${m4}.dtb;
 	elif itest.s x8MM == "x${imx_cpu}" ; then
 		fdt_file=imx8mm-${board}${m4}.dtb;
+	elif itest.s x8MMQ == "x${imx_cpu}" ; then
+		fdt_file=imx8mm-${board}.dtb;
+	elif itest.s x8MNano == "x${imx_cpu}" ; then
+		fdt_file=imx8mn-${board}.dtb;
 	elif itest.s x51 == "x${imx_cpu}" ; then
 		fdt_file=imx51-${board}${m4}.dtb;
 	elif itest.s x53 == "x${imx_cpu}" ; then
diff --git a/board/boundary/bootscripts/bootscript-yocto.txt b/board/boundary/bootscripts/bootscript-yocto.txt
index 4a05cd85403..8ce490745ff 100644
--- a/board/boundary/bootscripts/bootscript-yocto.txt
+++ b/board/boundary/bootscripts/bootscript-yocto.txt
@@ -11,7 +11,7 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x70000000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_base=0x40000000
 	kernelimage=Image
 	bootcommand=booti
@@ -51,6 +51,10 @@ if itest.s "x" == "x${fdt_file}" ; then
 		fdt_file=imx8mq-${board}${m4}.dtb;
 	elif itest.s x8MM == "x${imx_cpu}" ; then
 		fdt_file=imx8mm-${board}${m4}.dtb;
+	elif itest.s x8MMQ == "x${imx_cpu}" ; then
+		fdt_file=imx8mm-${board}.dtb;
+	elif itest.s x8MNano == "x${imx_cpu}" ; then
+		fdt_file=imx8mn-${board}.dtb;
 	elif itest.s x51 == "x${imx_cpu}" ; then
 		fdt_file=imx51-${board}${m4}.dtb;
 	elif itest.s x53 == "x${imx_cpu}" ; then
diff --git a/board/boundary/bootscripts/image-gzwrite.txt b/board/boundary/bootscripts/image-gzwrite.txt
index 5aeecdd08ec..25edff7730f 100644
--- a/board/boundary/bootscripts/image-gzwrite.txt
+++ b/board/boundary/bootscripts/image-gzwrite.txt
@@ -15,7 +15,7 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x70000000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_base=0x40000000
 fi
 setexpr a_gz  ${a_base} + 0x00080000
diff --git a/board/boundary/bootscripts/net_upgrade_fs.txt b/board/boundary/bootscripts/net_upgrade_fs.txt
index 5fa85b05d77..59bcccf50ed 100644
--- a/board/boundary/bootscripts/net_upgrade_fs.txt
+++ b/board/boundary/bootscripts/net_upgrade_fs.txt
@@ -12,7 +12,7 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x70200000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_base=0x40200000
 fi
 
diff --git a/board/boundary/bootscripts/net_upgradeu.txt b/board/boundary/bootscripts/net_upgradeu.txt
index 12ddea71e03..23d962aa2f4 100644
--- a/board/boundary/bootscripts/net_upgradeu.txt
+++ b/board/boundary/bootscripts/net_upgradeu.txt
@@ -23,7 +23,7 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x70100000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_base=0x42000000
 	offset=0x8400
 fi
diff --git a/board/boundary/bootscripts/net_upgradeu_fs.txt b/board/boundary/bootscripts/net_upgradeu_fs.txt
index cc24421b128..d2ac23919ae 100644
--- a/board/boundary/bootscripts/net_upgradeu_fs.txt
+++ b/board/boundary/bootscripts/net_upgradeu_fs.txt
@@ -7,7 +7,7 @@ setenv a_script
 a_script=0x1000c000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_script=0x4000c000
 fi
 # uncomment below to force upgrade to eMMC,
diff --git a/board/boundary/bootscripts/upgrade.txt b/board/boundary/bootscripts/upgrade.txt
index 3e14d3093fd..b4ad75f4fcc 100644
--- a/board/boundary/bootscripts/upgrade.txt
+++ b/board/boundary/bootscripts/upgrade.txt
@@ -15,7 +15,7 @@ elif itest.s x53 == "x${imx_cpu}"; then
 	a_base=0x72000000
 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
+elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then
 	a_base=0x42000000
 	offset=0x8400
 fi
-- 
GitLab