Merge tag 'v2023.07-rc6' into next

Prepare v2023.07-rc6
2023-07-05 11:28:55 -04:00
parent 45f77b807c e1bebc16e1
commit e80f4079b3
124 changed files with 5042 additions and 4066 deletions
--- a/test/py/tests/test_efi_fit.py
+++ b/test/py/tests/test_efi_fit.py
@@ -431,6 +431,11 @@ def test_efi_fit_launch(u_boot_console):
    cons = u_boot_console
    # Array slice removes leading/trailing quotes.
    sys_arch = cons.config.buildconfig.get('config_sys_arch', '"sandbox"')[1:-1]
+    if sys_arch == 'arm':
+        arm64 = cons.config.buildconfig.get('config_arm64')
+        if arm64:
+            sys_arch = 'arm64'
+
    is_sandbox = sys_arch == 'sandbox'

    if is_sandbox: