The AST2700 boot tests appended 'cryptomgr.notests=1' to the kernel
command line to skip the Linux crypto manager self-tests.

Now that the HACE crypto engine emulates the crypto command, the
self-tests pass, so drop the workaround and let them run. This also
exercises the HACE crypto emulation during the functional boot tests.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 tests/functional/aarch64/test_aspeed_ast2700a1.py | 5 -----
 tests/functional/aarch64/test_aspeed_ast2700a2.py | 5 -----
 tests/functional/aarch64/test_aspeed_ast2700fc.py | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/tests/functional/aarch64/test_aspeed_ast2700a1.py b/tests/functional/aarch64/test_aspeed_ast2700a1.py
index b0c08854da..bc535449b5 100755
--- a/tests/functional/aarch64/test_aspeed_ast2700a1.py
+++ b/tests/functional/aarch64/test_aspeed_ast2700a1.py
@@ -51,10 +51,6 @@ def verify_vbootrom_firmware_flow(self):
         wait_for_console_pattern(self, 'pass')
         wait_for_console_pattern(self, 'Jumping to BL31 (Trusted Firmware-A)')
 
-    def disable_kernel_crypto_selftest(self):
-         exec_command_and_wait_for_pattern(self,
-            'setenv bootargs "${bootargs} cryptomgr.notests=1"', '=>')
-
     def enable_ast2700_pcie2(self):
         exec_command_and_wait_for_pattern(self,
             'cp 100420000 403000000 900000', '=>')
@@ -71,7 +67,6 @@ def verify_openbmc_boot_start(self, enable_pcie=True):
         wait_for_console_pattern(self, 'U-Boot 2023.10')
         wait_for_console_pattern(self, 'Hit any key to stop autoboot')
         exec_command_and_wait_for_pattern(self, '\012', '=>')
-        self.disable_kernel_crypto_selftest()
         if enable_pcie:
             self.enable_ast2700_pcie2()
         else:
diff --git a/tests/functional/aarch64/test_aspeed_ast2700a2.py b/tests/functional/aarch64/test_aspeed_ast2700a2.py
index ed414999f4..5aea0a9dd0 100755
--- a/tests/functional/aarch64/test_aspeed_ast2700a2.py
+++ b/tests/functional/aarch64/test_aspeed_ast2700a2.py
@@ -51,10 +51,6 @@ def verify_vbootrom_firmware_flow(self):
         wait_for_console_pattern(self, 'pass')
         wait_for_console_pattern(self, 'Jumping to BL31 (Trusted Firmware-A)')
 
-    def disable_kernel_crypto_selftest(self):
-         exec_command_and_wait_for_pattern(self,
-            'setenv bootargs "${bootargs} cryptomgr.notests=1"', '=>')
-
     def enable_ast2700_pcie2(self):
         exec_command_and_wait_for_pattern(self,
             'cp 100420000 403000000 900000', '=>')
@@ -71,7 +67,6 @@ def verify_openbmc_boot_start(self, enable_pcie=True):
         wait_for_console_pattern(self, 'U-Boot 2023.10')
         wait_for_console_pattern(self, 'Hit any key to stop autoboot')
         exec_command_and_wait_for_pattern(self, '\012', '=>')
-        self.disable_kernel_crypto_selftest()
         if enable_pcie:
             self.enable_ast2700_pcie2()
         else:
diff --git a/tests/functional/aarch64/test_aspeed_ast2700fc.py b/tests/functional/aarch64/test_aspeed_ast2700fc.py
index df889134ed..1648fa9dba 100755
--- a/tests/functional/aarch64/test_aspeed_ast2700fc.py
+++ b/tests/functional/aarch64/test_aspeed_ast2700fc.py
@@ -27,10 +27,6 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
 
         self.vm.launch()
 
-    def disable_kernel_crypto_selftest(self):
-         exec_command_and_wait_for_pattern(self,
-            'setenv bootargs "${bootargs} cryptomgr.notests=1"', '=>')
-
     def enable_ast2700_pcie2(self):
         exec_command_and_wait_for_pattern(self,
             'cp 100420000 403000000 900000', '=>')
@@ -47,7 +43,6 @@ def verify_openbmc_boot_and_login(self, name):
         wait_for_console_pattern(self, 'U-Boot 2023.10')
         wait_for_console_pattern(self, 'Hit any key to stop autoboot')
         exec_command_and_wait_for_pattern(self, '\012', '=>')
-        self.disable_kernel_crypto_selftest()
         self.enable_ast2700_pcie2()
         wait_for_console_pattern(self, 'Starting kernel ...')
 
-- 
2.43.0