From 2028cc59f7b904f8e91a99439aa630b20932baa5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 18 Jun 2017 22:09:05 -0600 Subject: [PATCH] sandbox: Stop printing platdata at the start of SPL Currently we have code which prints out platform data at the start of SPL. Now that we have tests for dtoc this is probably not necessary. Drop it. Update test_ofplatdata to check for empty output since it is useful to check that sandbox_spl works as expected. Signed-off-by: Simon Glass --- arch/sandbox/cpu/spl.c | 11 ----------- test/py/tests/test_ofplatdata.py | 30 +----------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 7cc76d4cf1..2495fa9b08 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -44,16 +44,5 @@ SPL_LOAD_IMAGE_METHOD("sandbox", 0, BOOT_DEVICE_BOARD, spl_board_load_image); void spl_board_init(void) { - struct udevice *dev; - preloader_console_init(); - - /* - * Scan all the devices so that we can output their platform data. See - * sandbox_spl_probe(). - */ - for (uclass_first_device(UCLASS_MISC, &dev); - dev; - uclass_next_device(&dev)) - ; } diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py index 457c4055af..0660ce41d8 100644 --- a/test/py/tests/test_ofplatdata.py +++ b/test/py/tests/test_ofplatdata.py @@ -4,35 +4,7 @@ import pytest -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 00 00 00 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 -stringarray "one" "" "" -''' +OF_PLATDATA_OUTPUT = '' @pytest.mark.buildconfigspec('spl_of_platdata') def test_ofplatdata(u_boot_console): -- 2.39.2