[Concept,07/24] boot: test: Add another Ubuntu image on mmc11

Message ID 20251018084117.1798704-8-sjg@u-boot.org
State New
Headers
Series bootctl: Expand bootctl to include a new UI |

Commit Message

Simon Glass Oct. 18, 2025, 8:40 a.m. UTC
  From: Simon Glass <sjg@chromium.org>

Bring in a test image which has a different version of Ubuntu.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/sandbox/dts/test.dts | 9 +++++++++
 test/py/tests/test_ut.py  | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
  

Patch

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index da4a89baf30..86c01545462 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -47,6 +47,8 @@ 
 		mmc7 = "/mmc7";
 		mmc8 = "/mmc8";
 		mmc9 = "/mmc9";
+		mmc10 = "/mmc10";
+		mmc11 = "/mmc11";
 		pci0 = &pci0;
 		pci1 = &pci1;
 		pci2 = &pci2;
@@ -1194,6 +1196,13 @@ 
 		filename = "mmc10.img";
 	};
 
+	/* This is used for bootctl tests */
+	mmc11 {
+		status = "disabled";
+		compatible = "sandbox,mmc";
+		filename = "mmc11.img";
+	};
+
 	pch {
 		compatible = "sandbox,pch";
 	};
diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py
index 0acc40ae6aa..b532bdced13 100644
--- a/test/py/tests/test_ut.py
+++ b/test/py/tests/test_ut.py
@@ -80,9 +80,10 @@  def test_ut_dm_init_bootstd(u_boot_config, u_boot_log):
     setup_cros_image(u_boot_config, u_boot_log)
     setup_android_image(u_boot_config, u_boot_log)
     setup_efi_image(u_boot_config)
-    setup_ubuntu_image(u_boot_config, u_boot_log, 3, 'flash')
+    setup_ubuntu_image(u_boot_config, u_boot_log, 3, 'flash', '25.04')
     setup_localboot_image(u_boot_config, u_boot_log)
     setup_vbe_image(u_boot_config, u_boot_log)
+    setup_ubuntu_image(u_boot_config, u_boot_log, 11, 'mmc')
 
 def test_ut(ubman, ut_subtest):
     """Execute a "ut" subtest.