dm: test: Drop of-platdata pytest

Now that we have a C version of this test, drop the Python implementation.

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

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 81b217a1d70f0d67c8c8ba2d089799e213fdfcb2..9a77da15619c160d43ea3f41ca43c6814b59b8b4 100644 (file)
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -54,20 +54,8 @@ SPL_LOAD_IMAGE_METHOD("sandbox", 9, BOOT_DEVICE_BOARD, spl_board_load_image);
 void spl_board_init(void)
 {
        struct sandbox_state *state = state_get_current();
-       struct udevice *dev;
 
        preloader_console_init();
-       if (state->show_of_platdata) {
-               /*
-                * Scan all the devices so that we can output their platform
-                * data. See sandbox_spl_probe().
-                */
-               printf("Scanning misc devices\n");
-               for (uclass_first_device(UCLASS_MISC, &dev);
-                    dev;
-                    uclass_next_device(&dev))
-                       ;
-       }
 
        if (state->run_unittests) {
                int ret;

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 569dafbcfeed364001275b290d47492275b55c52..58ada13fba5e889fb11853b3efece8baeb2dea51 100644 (file)
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -365,15 +365,6 @@ static int sandbox_cmdline_cb_log_level(struct sandbox_state *state,
 SANDBOX_CMDLINE_OPT_SHORT(log_level, 'L', 1,
                          "Set log level (0=panic, 7=debug)");
 
-static int sandbox_cmdline_cb_show_of_platdata(struct sandbox_state *state,
-                                              const char *arg)
-{
-       state->show_of_platdata = true;
-
-       return 0;
-}
-SANDBOX_CMDLINE_OPT(show_of_platdata, 0, "Show of-platdata in SPL");
-
 static int sandbox_cmdline_cb_unittests(struct sandbox_state *state,
                                        const char *arg)
 {

diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h
index 7547602dd1c96cc60ae974bcbbcbe29ecab0db8f..bca13069824461aaa4525fd4c0edf567e08eea7b 100644 (file)
--- a/arch/sandbox/include/asm/state.h
+++ b/arch/sandbox/include/asm/state.h
@@ -90,7 +90,6 @@ struct sandbox_state {
        bool skip_delays;               /* Ignore any time delays (for test) */
        bool show_test_output;          /* Don't suppress stdout in tests */
        int default_log_level;          /* Default log level for sandbox */
-       bool show_of_platdata;          /* Show of-platdata in SPL */
        bool ram_buf_read;              /* true if we read the RAM buffer */
        bool run_unittests;             /* Run unit tests */
        const char *select_unittests;   /* Unit test to run */

diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c
index 999031625b54e25792944cbd30aabe29bcd36cff..3ae6707593e57bf3a738af7f227655e711644014 100644 (file)
--- a/drivers/misc/spltest_sandbox.c
+++ b/drivers/misc/spltest_sandbox.c
@@ -8,43 +8,8 @@
 #include <dm.h>
 #include <dt-structs.h>
 
-static int sandbox_spl_probe(struct udevice *dev)
-{
-       struct dtd_sandbox_spl_test *plat = dev_get_platdata(dev);
-       int i;
-
-       printf("of-platdata probe:\n");
-       printf("bool %d\n", plat->boolval);
-
-       printf("byte %02x\n", plat->byteval);
-       printf("bytearray");
-       for (i = 0; i < sizeof(plat->bytearray); i++)
-               printf(" %02x", plat->bytearray[i]);
-       printf("\n");
-
-       printf("int %d\n", plat->intval);
-       printf("intarray");
-       for (i = 0; i < ARRAY_SIZE(plat->intarray); i++)
-               printf(" %d", plat->intarray[i]);
-       printf("\n");
-
-       printf("longbytearray");
-       for (i = 0; i < sizeof(plat->longbytearray); i++)
-               printf(" %02x", plat->longbytearray[i]);
-       printf("\n");
-
-       printf("string %s\n", plat->stringval);
-       printf("stringarray");
-       for (i = 0; i < ARRAY_SIZE(plat->stringarray); i++)
-               printf(" \"%s\"", plat->stringarray[i]);
-       printf("\n");
-
-       return 0;
-}
-
 U_BOOT_DRIVER(sandbox_spl_test) = {
        .name   = "sandbox_spl_test",
        .id     = UCLASS_MISC,
        .flags  = DM_FLAG_PRE_RELOC,
-       .probe  = sandbox_spl_probe,
 };

diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py
index 13154935b9b9f76b5ae36f9cdd9e1df0d9a83bcd..78837a3c0081f9fd69a933f13c0a18428014ec76 100644 (file)
--- a/test/py/tests/test_ofplatdata.py
+++ b/test/py/tests/test_ofplatdata.py
@@ -4,53 +4,6 @@
 import pytest
 import u_boot_utils as util
 
-OF_PLATDATA_OUTPUT = '''
-of-platdata probe:
-bool 1
-byte 05
-bytearray 06 00 00
-int 1
-intarray 2 3 4 0
-longbytearray 09 0a 0b 0c 0d 0e 0f 10 11
-string message
-stringarray "multi-word" "message" ""
-of-platdata probe:
-bool 0
-byte 08
-bytearray 01 23 34
-int 3
-intarray 5 0 0 0
-longbytearray 09 0a 0b 0c 00 00 00 00 00
-string message2
-stringarray "another" "multi-word" "message"
-of-platdata probe:
-bool 0
-byte 00
-bytearray 00 00 00
-int 0
-intarray 0 0 0 0
-longbytearray 00 00 00 00 00 00 00 00 00
-string <NULL>
-stringarray "one" "" ""
-of-platdata probe:
-bool 0
-byte 00
-bytearray 00 00 00
-int 0
-intarray 0 0 0 0
-longbytearray 00 00 00 00 00 00 00 00 00
-string <NULL>
-stringarray "spl" "" ""
-'''
-
-@pytest.mark.buildconfigspec('spl_of_platdata')
-def test_ofplatdata(u_boot_console):
-    """Test that of-platdata can be generated and used in sandbox"""
-    cons = u_boot_console
-    cons.restart_uboot_with_flags(['--show_of_platdata'])
-    output = cons.get_spawn_output().replace('\r', '')
-    assert OF_PLATDATA_OUTPUT in output
-
 @pytest.mark.buildconfigspec('spl_of_platdata')
 def test_spl_devicetree(u_boot_console):
     """Test content of spl device-tree"""