boundary: bootscript-ubuntu.txt: add i.MX8MQ support

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>

board/boundary/bootscripts/bootscript-ubuntu.txt

@@ -2,6 +2,8 @@ setenv bootargs ''
 
 setenv initrd_high 0xffffffff
 m4=''
+kernelimage=vmlinuz
+bootcommand=bootz
 a_base=0x10000000
 if itest.s x51 == "x${imx_cpu}" ; then
 	a_base=0x90000000
@@ -9,10 +11,14 @@ 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
 	a_base=0x80000000
-	if itest.s "x1" == "x$m4enabled" ; then
-		run m4boot;
-		m4='-m4';
-	fi
+elif itest.s x8MQ == "x${imx_cpu}"; then
+	a_base=0x40000000
+	kernelimage=vmlinux
+	bootcommand=booti
+fi
+if itest.s "x1" == "x$m4enabled" ; then
+	run m4boot;
+	m4='-m4';
 fi
 
 setexpr a_script  ${a_base} + 0x00800000
@@ -39,6 +45,8 @@ if itest.s "x" == "x${fdt_file}" ; then
 		fdt_file=imx6sx-${board}${m4}.dtb;
 	elif itest.s x7D == "x${imx_cpu}" ; then
 		fdt_file=imx7d-${board}${m4}.dtb;
+	elif itest.s x8MQ == "x${imx_cpu}" ; then
+		fdt_file=imx8mq-${board}${m4}.dtb;
 	elif itest.s x51 == "x${imx_cpu}" ; then
 		fdt_file=imx51-${board}${m4}.dtb;
 	elif itest.s x53 == "x${imx_cpu}" ; then
@@ -69,46 +77,31 @@ else
 	exit;
 fi
 
-cmd_xxx_present=
 fdt resize
 if itest.s "x" != "x${cmd_custom}" ; then
 	run cmd_custom
-	cmd_xxx_present=1;
 fi
-
 if itest.s "x" != "x${cmd_hdmi}" ; then
 	run cmd_hdmi
-	cmd_xxx_present=1;
-	if itest.s x == x${allow_noncea} ; then
-		setenv bootargs ${bootargs} mxc_hdmi.only_cea=1;
-		echo "only CEA modes allowed on HDMI port";
-	else
+	if itest.s x != x${allow_noncea} ; then
 		setenv bootargs ${bootargs} mxc_hdmi.only_cea=0;
 		echo "non-CEA modes allowed on HDMI, audio may be affected";
 	fi
 fi
-
 if itest.s "x" != "x${cmd_lcd}" ; then
 	run cmd_lcd
-	cmd_xxx_present=1;
 fi
 if itest.s "x" != "x${cmd_lcd2}" ; then
 	run cmd_lcd2
-	cmd_xxx_present=1;
 fi
 if itest.s "x" != "x${cmd_lvds}" ; then
 	run cmd_lvds
-	cmd_xxx_present=1;
 fi
 if itest.s "x" != "x${cmd_lvds2}" ; then
 	run cmd_lvds2
-	cmd_xxx_present=1;
 fi
-
-if itest.s "x" == "x${cmd_xxx_present}" ; then
-	echo "!!!!!!!!!!!!!!!!"
-	echo "warning: your u-boot may be outdated, please upgrade"
-	echo "!!!!!!!!!!!!!!!!"
+if itest.s "x" != "x${cmd_mipi}" ; then
+	run cmd_mipi
 fi
 
 setexpr b0 ${distro_bootpart} % 0x0a;
@@ -134,7 +127,7 @@ if itest.s "x" != "x${disable_giga}" ; then
 fi
 
 if itest.s "x" != "x${wlmac}" ; then
-	setenv bootargs ${bootargs} wlan.mac=${wlmac} wlcore.mac=${wlmac}
+	setenv bootargs ${bootargs} wlcore.mac=${wlmac}
 fi
 
 if itest.s "x" != "x${bd_addr}" ; then
@@ -145,7 +138,6 @@ if itest.s "x" != "x${gpumem}" ; then
 	setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem}
 fi
 
-
 if itest.s "no" != "${dosplash}" ; then
 	if itest.s "x" == "x${loglevel}" ; then
 		loglevel=4
@@ -182,16 +174,6 @@ if itest.s "x" != "x${show_env}" ; then
 	printenv
 fi
 
-if kbd ; then
-        if itest.s "xv" == "x${keybd}" ; then
-                load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}uImage-recovery &&
-                load ${devtype} ${devnum}:${distro_bootpart} ${a_ramdisk} ${prefix}uramdisk-recovery.img &&
-                bootm ${a_zImage} ${a_ramdisk};
-                echo "--- error launching recovery!"
-                exit;
-        fi
-fi
-
 echo "----------- trying to load /initrd.img";
 if load ${devtype} ${devnum}:${distro_bootpart} ${a_initrd} /initrd.img ; then
 	haverd=1;
@@ -201,13 +183,13 @@ else
 fi
 
 if itest.s x${haverd} == x ; then
-	if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} /vmlinuz ; then
+	if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} /${kernelimage} ; then
 		setenv bootargs ${bootargs} rw
-		bootz ${a_zImage} - ${a_fdt}
+		${bootcommand} ${a_zImage} - ${a_fdt}
 	fi
 else
-	if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} /vmlinuz ; then
-		bootz ${a_zImage} ${a_initrd}:${initrd_size} ${a_fdt} ;
+	if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} /${kernelimage} ; then
+		${bootcommand} ${a_zImage} ${a_initrd}:${initrd_size} ${a_fdt} ;
 	fi
 fi
 echo "Error loading kernel image"