Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>

13 files changed, 101 insertions, 19 deletions

diff --git a/test/Kconfig b/test/Kconfig
index a6b463e4d0..9f4641ae6b 100644
--- a/test/Kconfig
+++ b/test/Kconfig
@@ -1,3 +1,8 @@
+config POST
+	bool "Power On Self Test support"
+	help
+	  See doc/README.POST for more details
+
 menuconfig UNIT_TEST
 	bool "Unit tests"
 	help
diff --git a/test/dm/blk.c b/test/dm/blk.c
index 612f3ffb32..0aa04c64ef 100644
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -127,7 +127,7 @@ static int dm_test_blk_devnum(struct unit_test_state *uts)
 
 	/*
 	 * Probe the devices, with the first one being probed last. This is the
-	 * one with no alias / sequence numnber.
+	 * one with no alias / sequence number.
 	 */
 	ut_assertok(uclass_get_device(UCLASS_MMC, 1, &dev));
 	ut_assertok(uclass_get_device(UCLASS_MMC, 2, &dev));
diff --git a/test/dm/button.c b/test/dm/button.c
index f8a7fab61d..e76c1ad030 100644
--- a/test/dm/button.c
+++ b/test/dm/button.c
@@ -46,7 +46,7 @@ static int dm_test_button_gpio(struct unit_test_state *uts)
 	struct udevice *dev, *gpio;
 
 	/*
-	 * Check that we can manipulate an BUTTON. BUTTON 1 is connected to GPIO
+	 * Check that we can manipulate a BUTTON. BUTTON 1 is connected to GPIO
 	 * bank gpio_a, offset 3.
 	 */
 	ut_assertok(uclass_get_device(UCLASS_BUTTON, 1, &dev));
@@ -64,7 +64,7 @@ static int dm_test_button_gpio(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_button_gpio, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
 
-/* Test obtaining an BUTTON by label */
+/* Test obtaining a BUTTON by label */
 static int dm_test_button_label(struct unit_test_state *uts)
 {
 	struct udevice *dev, *cmp;
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index a8c35d4370..0d88ec24bd 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -348,7 +348,7 @@ static int dm_test_gpio_phandles(struct unit_test_state *uts)
 	ut_asserteq(-ENOENT, gpio_request_by_name(dev, "test-gpios", 5, &desc,
 						  0));
 
-	/* Last GPIO is ignord as it comes after <0> */
+	/* Last GPIO is ignored as it comes after <0> */
 	ut_asserteq(3, gpio_request_list_by_name(dev, "test-gpios", desc_list,
 						 ARRAY_SIZE(desc_list), 0));
 	ut_asserteq(-EBUSY, gpio_request_list_by_name(dev, "test-gpios",
@@ -377,7 +377,7 @@ static int dm_test_gpio_phandles(struct unit_test_state *uts)
 	ut_asserteq(6, gpio_request_list_by_name(dev, "test2-gpios", desc_list,
 						 ARRAY_SIZE(desc_list), 0));
 
-	/* This was set to output previously but flags resetted to 0 = INPUT */
+	/* This was set to output previously but flags reset to 0 = INPUT */
 	ut_asserteq(0, sandbox_gpio_get_flags(gpio_a, 1));
 	ut_asserteq(GPIOF_INPUT, gpio_get_function(gpio_a, 1, NULL));
 
diff --git a/test/dm/host.c b/test/dm/host.c
index 4dafc24abb..355ba7770a 100644
--- a/test/dm/host.c
+++ b/test/dm/host.c
@@ -132,7 +132,7 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
 
 	ut_assertok(run_commandf("host bind fat %s", filename2));
 
-	/* Check it is not removeable (no '-r') */
+	/* Check it is not removable (no '-r') */
 	ut_assertok(uclass_next_device_err(&dev));
 	ut_assertok(blk_get_from_parent(dev, &blk));
 	desc = dev_get_uclass_plat(blk);
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index 1cc07bc808..7a8ff47fa1 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -139,7 +139,7 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
 		0x20, 0x00, 0x00, 0x00,
 		/* memsz = filesz */
 		0x20, 0x00, 0x00, 0x00,
-		/* flags : readable and exectuable */
+		/* flags : readable and executable */
 		0x05, 0x00, 0x00, 0x00,
 		/* padding */
 		0x00, 0x00, 0x00, 0x00,
@@ -208,7 +208,7 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
 	 * at SDRAM_BASE *device* address (p_paddr field).
 	 * Its size is defined by the p_filesz field.
 	 */
-	phdr->p_paddr = CONFIG_SYS_SDRAM_BASE;
+	phdr->p_paddr = CFG_SYS_SDRAM_BASE;
 	loaded_firmware_size = phdr->p_filesz;
 
 	/*
@@ -231,7 +231,7 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
 	unmap_physmem(loaded_firmware, MAP_NOCACHE);
 
 	/* Resource table */
-	shdr->sh_addr = CONFIG_SYS_SDRAM_BASE;
+	shdr->sh_addr = CFG_SYS_SDRAM_BASE;
 	rsc_table_size = shdr->sh_size;
 
 	loaded_rsc_table_paddr = shdr->sh_addr + DEVICE_TO_PHYSICAL_OFFSET;
@@ -243,7 +243,7 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
 	/* Load and verify */
 	ut_assertok(rproc_elf32_load_rsc_table(dev, (ulong)valid_elf32, size,
 					       &rsc_addr, &rsc_size));
-	ut_asserteq(rsc_addr, CONFIG_SYS_SDRAM_BASE);
+	ut_asserteq(rsc_addr, CFG_SYS_SDRAM_BASE);
 	ut_asserteq(rsc_size, rsc_table_size);
 	ut_asserteq_mem(loaded_firmware, valid_elf32 + shdr->sh_offset,
 			shdr->sh_size);
diff --git a/test/dm/scmi.c b/test/dm/scmi.c
index 795f207304..93c7d08f43 100644
--- a/test/dm/scmi.c
+++ b/test/dm/scmi.c
@@ -6,7 +6,7 @@
  * uclass devices probe when a SCMI server exposes resources.
  *
  * Note in test.dts the protocol@10 node in scmi node. Protocol 0x10 is not
- * implemented in U-Boot SCMI components but the implementation is exepected
+ * implemented in U-Boot SCMI components but the implementation is expected
  * to not complain on unknown protocol IDs, as long as it is not used. Note
  * in test.dts tests that SCMI drivers probing does not fail for such an
  * unknown SCMI protocol ID.
diff --git a/test/dm/spmi.c b/test/dm/spmi.c
index 114fd2d22e..9cc284b98c 100644
--- a/test/dm/spmi.c
+++ b/test/dm/spmi.c
@@ -17,7 +17,7 @@
 #include <test/test.h>
 #include <test/ut.h>
 
-/* Test if bus childs got probed propperly*/
+/* Test if bus children got probed properly*/
 static int dm_test_spmi_probe(struct unit_test_state *uts)
 {
 	const char *name = "spmi@0";
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 8bb868b678..7cd2d04612 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -592,7 +592,7 @@ static int dm_test_fdt_translation(struct unit_test_state *uts)
 	ut_asserteq_str("dev@2,200", dev->name);
 	ut_asserteq(0xA000, dev_read_addr(dev));
 
-	/* No translation for busses with #size-cells == 0 */
+	/* No translation for buses with #size-cells == 0 */
 	ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 3, &dev));
 	ut_asserteq_str("dev@42", dev->name);
 	ut_asserteq(0x42, dev_read_addr(dev));
diff --git a/test/log/pr_cont_test.c b/test/log/pr_cont_test.c
index 6abddf7a11..df4520d280 100644
--- a/test/log/pr_cont_test.c
+++ b/test/log/pr_cont_test.c
@@ -16,9 +16,6 @@
 
 #define BUFFSIZE 64
 
-#undef CONFIG_LOGLEVEL
-#define CONFIG_LOGLEVEL 4
-
 DECLARE_GLOBAL_DATA_PTR;
 
 static int log_test_pr_cont(struct unit_test_state *uts)
diff --git a/test/py/tests/source.its b/test/py/tests/source.its
new file mode 100644
index 0000000000..3c62f777f1
--- /dev/null
+++ b/test/py/tests/source.its
@@ -0,0 +1,43 @@
+/dts-v1/;
+
+/ {
+    description = "FIT image to test the source command";
+    #address-cells = <1>;
+
+    images {
+        default = "script-1";
+
+        script-1 {
+            data = "echo 1";
+            type = "script";
+            arch = "sandbox";
+            compression = "none";
+        };
+
+        script-2 {
+            data = "echo 2";
+            type = "script";
+            arch = "sandbox";
+            compression = "none";
+        };
+
+        not-a-script {
+            data = "echo 3";
+            type = "kernel";
+            arch = "sandbox";
+            compression = "none";
+        };
+    };
+
+    configurations {
+        default = "conf-2";
+
+        conf-1 {
+            script = "script-1";
+        };
+
+        conf-2 {
+            script = "script-2";
+        };
+    };
+};
diff --git a/test/py/tests/test_event_dump.py b/test/py/tests/test_event_dump.py
index 1a46ca30f4..da196df4c3 100644
--- a/test/py/tests/test_event_dump.py
+++ b/test/py/tests/test_event_dump.py
@@ -16,7 +16,7 @@ def test_event_dump(u_boot_console):
     out = util.run_and_log(cons, ['scripts/event_dump.py', sandbox])
     expect = '''.*Event type            Id                              Source location
 --------------------  ------------------------------  ------------------------------
-EVT_FT_FIXUP          bootmeth_vbe_ft_fixup           .*vbe_request.c:.*
-EVT_FT_FIXUP          bootmeth_vbe_simple_ft_fixup    .*vbe_simple_os.c:.*
-EVT_MISC_INIT_F       sandbox_misc_init_f             .*start.c:'''
+EVT_FT_FIXUP          bootmeth_vbe_ft_fixup           .*boot/vbe_request.c:.*
+EVT_FT_FIXUP          bootmeth_vbe_simple_ft_fixup    .*boot/vbe_simple_os.c:.*
+EVT_MISC_INIT_F       sandbox_misc_init_f             .*arch/sandbox/cpu/start.c:'''
     assert re.match(expect, out, re.MULTILINE) is not None
diff --git a/test/py/tests/test_source.py b/test/py/tests/test_source.py
new file mode 100644
index 0000000000..bbc311df6d
--- /dev/null
+++ b/test/py/tests/test_source.py
@@ -0,0 +1,37 @@
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (C) 2022 Sean Anderson <sean.anderson@seco.com>
+
+import os
+import pytest
+import u_boot_utils as util
+
+@pytest.mark.boardspec('sandbox')
+@pytest.mark.buildconfigspec('cmd_echo')
+@pytest.mark.buildconfigspec('cmd_source')
+@pytest.mark.buildconfigspec('fit')
+def test_source(u_boot_console):
+    # Compile our test script image
+    cons = u_boot_console
+    mkimage = os.path.join(cons.config.build_dir, 'tools/mkimage')
+    its = os.path.join(cons.config.source_dir, 'test/py/tests/source.its')
+    fit = os.path.join(cons.config.build_dir, 'source.itb')
+    util.run_and_log(cons, (mkimage, '-f', its, fit))
+    cons.run_command(f'host load hostfs - $loadaddr {fit}')
+
+    assert '2' in cons.run_command('source')
+    assert '1' in cons.run_command('source :')
+    assert '1' in cons.run_command('source :script-1')
+    assert '2' in cons.run_command('source :script-2')
+    assert 'Fail' in cons.run_command('source :not-a-script || echo Fail')
+    assert '2' in cons.run_command('source \\#')
+    assert '1' in cons.run_command('source \\#conf-1')
+    assert '2' in cons.run_command('source \\#conf-2')
+
+    cons.run_command('fdt addr $loadaddr')
+    cons.run_command('fdt rm /configurations default')
+    assert '1' in cons.run_command('source')
+    assert 'Fail' in cons.run_command('source \\# || echo Fail')
+
+    cons.run_command('fdt rm /images default')
+    assert 'Fail' in cons.run_command('source || echo Fail')
+    assert 'Fail' in cons.run_command('source \\# || echo Fail')