[PATCH 2/2] live-image: create a separate menu for arm64/aarch64

[Alex Hung]

Also add the EBBR test to arm64/aarch64.

Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
 live-image/fwts-frontend-text | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text
index 430ea271..5ac327dd 100755
--- a/live-image/fwts-frontend-text
+++ b/live-image/fwts-frontend-text
@@ -373,13 +373,14 @@ do
 			"Abort" "Abort Testing" off \
 			2> $OPTIONS
 			;;
-		*)
+		aarch64)
 			dialog --help-button --backtitle "$FWTS" --title "Select Tests" --radiolist \
 			"This will run a suite of firmware tests that will check the BIOS and ACPI tables.  It can also find issues that can cause Linux problems.\n\nThe default below is to run just all the Batch Tests, but you can select more tests below if required.\n\nPlease select below (using cursor up/down and space) and press enter to continue."\
 			24 70 8 \
 			"All" "All Batch Tests" on \
 			"ACPI" "ACPI Tests" off \
 			"UEFI" "UEFI Tests" off \
+			"EBBR" "ARM EBBR Tests" off \
 			"SBBR" "ARM SBBR Tests" off \
 			"Recommended" "Recommended Tests" off \
 			"Recommended for IFV" "Recommended Tests for F/W Vendors" off \
@@ -388,6 +389,20 @@ do
 			"Abort" "Abort Testing" off \
 			2> $OPTIONS
 			;;
+		*)
+			dialog --help-button --backtitle "$FWTS" --title "Select Tests" --radiolist \
+			"This will run a suite of firmware tests that will check the BIOS and ACPI tables.  It can also find issues that can cause Linux problems.\n\nThe default below is to run just all the Batch Tests, but you can select more tests below if required.\n\nPlease select below (using cursor up/down and space) and press enter to continue."\
+			24 70 8 \
+			"All" "All Batch Tests" on \
+			"ACPI" "ACPI Tests" off \
+			"UEFI" "UEFI Tests" off \
+			"Recommended" "Recommended Tests" off \
+			"Recommended for IFV" "Recommended Tests for F/W Vendors" off \
+			"Selected" "Select Individual Tests" off \
+			"Automated" "Create Auto-Tests" off \
+			"Abort" "Abort Testing" off \
+			2> $OPTIONS
+			;;
 
 	esac
 
@@ -415,6 +430,10 @@ do
 			do_test "--uefitests" 'Running UEFI Tests'
 			done_tests_finish
 			;;
+		'EBBR')
+			do_test "--ebbr" 'Embedded Base Boot Requirements (EBBR) Tests'
+			done_tests_finish
+			;;
 		'SBBR')
 			do_test "--sbbr" 'Server Base Boot Requirements (SBBR) Tests'
 			done_tests_finish
@@ -424,6 +443,9 @@ do
 				ppc*)
 					FWTS_OPTIONS="--batch"
 					;;
+				aarch64)
+					FWTS_OPTIONS="version cpufreq aspm dmicheck klog oops --acpitests --uefitests --log-level=medium"
+					;;
 				*)
 					FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --log-level=medium"
 					;;
@@ -433,7 +455,15 @@ do
 			done_tests_finish
 			;;
 		'Recommended for IFV')
-			FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --ifv"
+			case "${UNAME_PLATFORM}" in
+				aarch64)
+					FWTS_OPTIONS="version cpufreq aspm dmicheck klog oops --acpitests --uefitests --ifv"
+					;;
+				*)
+					FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --ifv"
+					;;
+			esac
+
 			do_test "${FWTS_OPTIONS}" 'Running Recommended Tests for F/W Vendors'
 			done_tests_finish
 			;;
-- 
2.25.1