diff options
Diffstat (limited to 'test')
197 files changed, 207 insertions, 13 deletions
diff --git a/test/bloblist.c b/test/bloblist.c index 7c63682908a..1c60bbac36c 100644 --- a/test/bloblist.c +++ b/test/bloblist.c @@ -3,6 +3,7 @@ * Copyright (c) 2018, Google Inc. All rights reserved. */ +#include <common.h> #include <bloblist.h> #include <log.h> #include <mapmem.h> diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c index 6e940002f84..0702fccdae6 100644 --- a/test/boot/bootdev.c +++ b/test/boot/bootdev.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <bootstd.h> #include <dm.h> #include <bootdev.h> diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 4511cfa7f9b..674d4c05f83 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/test/boot/bootmeth.c b/test/boot/bootmeth.c index 113b789ea79..e498eee036e 100644 --- a/test/boot/bootmeth.c +++ b/test/boot/bootmeth.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <bootmeth.h> #include <bootstd.h> #include <dm.h> diff --git a/test/boot/bootstd_common.c b/test/boot/bootstd_common.c index e50539500a0..cc97e255e5c 100644 --- a/test/boot/bootstd_common.c +++ b/test/boot/bootstd_common.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <bootdev.h> #include <bootstd.h> #include <dm.h> diff --git a/test/boot/cedit.c b/test/boot/cedit.c index fd19da0a0c0..aa417190486 100644 --- a/test/boot/cedit.c +++ b/test/boot/cedit.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <cedit.h> #include <env.h> #include <expo.h> diff --git a/test/boot/expo.c b/test/boot/expo.c index 6ea0184373d..714fdfa415d 100644 --- a/test/boot/expo.c +++ b/test/boot/expo.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <command.h> #include <dm.h> #include <expo.h> diff --git a/test/boot/image.c b/test/boot/image.c index 0894e30587f..2844b057859 100644 --- a/test/boot/image.c +++ b/test/boot/image.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <image.h> #include <test/suites.h> #include <test/ut.h> diff --git a/test/boot/measurement.c b/test/boot/measurement.c index 29be495412d..9db2ed324c2 100644 --- a/test/boot/measurement.c +++ b/test/boot/measurement.c @@ -6,6 +6,7 @@ * Written by Eddie James <eajames@linux.ibm.com> */ +#include <common.h> #include <bootm.h> #include <malloc.h> #include <test/suites.h> diff --git a/test/boot/vbe_fixup.c b/test/boot/vbe_fixup.c index 540816e42b0..eba5c4ebe6c 100644 --- a/test/boot/vbe_fixup.c +++ b/test/boot/vbe_fixup.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm/ofnode.h> #include <linux/libfdt.h> #include <test/test.h> diff --git a/test/boot/vbe_simple.c b/test/boot/vbe_simple.c index 3672b744e5f..5e61840652c 100644 --- a/test/boot/vbe_simple.c +++ b/test/boot/vbe_simple.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <bootmeth.h> #include <dm.h> #include <image.h> diff --git a/test/bootm.c b/test/bootm.c index 26c15552bf6..4bb3ca0655c 100644 --- a/test/bootm.c +++ b/test/bootm.c @@ -5,6 +5,7 @@ * Copyright 2020 Google LLC */ +#include <common.h> #include <bootm.h> #include <asm/global_data.h> #include <test/suites.h> diff --git a/test/cmd/addrmap.c b/test/cmd/addrmap.c index 7b8f49fd375..1eb5955db17 100644 --- a/test/cmd/addrmap.c +++ b/test/cmd/addrmap.c @@ -5,6 +5,7 @@ * Copyright (C) 2021, Bin Meng <bmeng.cn@gmail.com> */ +#include <common.h> #include <console.h> #include <test/suites.h> #include <test/ut.h> diff --git a/test/cmd/armffa.c b/test/cmd/armffa.c index 38f40b72f5e..9a44a397e8a 100644 --- a/test/cmd/armffa.c +++ b/test/cmd/armffa.c @@ -8,6 +8,7 @@ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> */ +#include <common.h> #include <string.h> #include <asm/sandbox_arm_ffa.h> #include <dm/test.h> diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 027848c3e24..4977d01f62d 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -5,6 +5,7 @@ * Copyright 2023 Marek Vasut <marek.vasut+renesas@mailbox.org> */ +#include <common.h> #include <console.h> #include <mapmem.h> #include <asm/global_data.h> diff --git a/test/cmd/exit.c b/test/cmd/exit.c index d310ec8531b..7e160f7e4bb 100644 --- a/test/cmd/exit.c +++ b/test/cmd/exit.c @@ -5,6 +5,7 @@ * Copyright 2022 Marek Vasut <marex@denx.de> */ +#include <common.h> #include <console.h> #include <mapmem.h> #include <asm/global_data.h> diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c index a0faf5aca90..54708552175 100644 --- a/test/cmd/fdt.c +++ b/test/cmd/fdt.c @@ -5,6 +5,7 @@ * Copyright 2022 Google LLC */ +#include <common.h> #include <console.h> #include <fdt_support.h> #include <mapmem.h> diff --git a/test/cmd/font.c b/test/cmd/font.c index a8905ce617e..1fe05c1ead5 100644 --- a/test/cmd/font.c +++ b/test/cmd/font.c @@ -5,6 +5,7 @@ * Copyright 2022 Google LLC */ +#include <common.h> #include <console.h> #include <dm.h> #include <video_console.h> diff --git a/test/cmd/history.c b/test/cmd/history.c index 6964bfa9e1e..06517fcdbb5 100644 --- a/test/cmd/history.c +++ b/test/cmd/history.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <cli.h> #include <command.h> #include <test/lib.h> diff --git a/test/cmd/loadm.c b/test/cmd/loadm.c index dff8a97d139..41e005ac592 100644 --- a/test/cmd/loadm.c +++ b/test/cmd/loadm.c @@ -9,6 +9,7 @@ * Rui Miguel Silva <rui.silva@linaro.org> */ +#include <common.h> #include <console.h> #include <mapmem.h> #include <asm/global_data.h> diff --git a/test/cmd/mem.c b/test/cmd/mem.c index f1bbab6055b..d76f47cf311 100644 --- a/test/cmd/mem.c +++ b/test/cmd/mem.c @@ -5,6 +5,7 @@ * Copyright 2020 Google LLC */ +#include <common.h> #include <command.h> #include <test/suites.h> #include <test/test.h> diff --git a/test/cmd/mem_search.c b/test/cmd/mem_search.c index 55ad2fac1e3..f80c9c40687 100644 --- a/test/cmd/mem_search.c +++ b/test/cmd/mem_search.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <console.h> #include <mapmem.h> #include <dm/test.h> diff --git a/test/cmd/pci_mps.c b/test/cmd/pci_mps.c index 2a64143eecd..fd96f4fba6c 100644 --- a/test/cmd/pci_mps.c +++ b/test/cmd/pci_mps.c @@ -7,6 +7,7 @@ * Written by Stephen Carlson <stcarlso@linux.microsoft.com> */ +#include <common.h> #include <console.h> #include <test/suites.h> #include <test/ut.h> diff --git a/test/cmd/pinmux.c b/test/cmd/pinmux.c index 4253baa5646..df40bb77435 100644 --- a/test/cmd/pinmux.c +++ b/test/cmd/pinmux.c @@ -5,6 +5,7 @@ * Copyright (C) 2021, STMicroelectronics - All Rights Reserved */ +#include <common.h> #include <command.h> #include <dm.h> #include <dm/test.h> diff --git a/test/cmd/rw.c b/test/cmd/rw.c index edd762e4d58..98302bf047b 100644 --- a/test/cmd/rw.c +++ b/test/cmd/rw.c @@ -3,6 +3,7 @@ * Tests for read and write commands */ +#include <common.h> #include <dm/test.h> #include <mapmem.h> #include <part.h> diff --git a/test/cmd/seama.c b/test/cmd/seama.c index b60f6550b13..b1b56930c64 100644 --- a/test/cmd/seama.c +++ b/test/cmd/seama.c @@ -5,6 +5,7 @@ * Copyright (C) 2021 Linus Walleij <linus.walleij@linaro.org> */ +#include <common.h> #include <command.h> #include <dm.h> #include <test/suites.h> diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index d50ce5803c3..ee329e94b85 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <console.h> #include <mapmem.h> #include <dm/test.h> diff --git a/test/cmd/temperature.c b/test/cmd/temperature.c index 364972626b1..2a1ea0611dc 100644 --- a/test/cmd/temperature.c +++ b/test/cmd/temperature.c @@ -5,6 +5,7 @@ * Copyright (C) 2022 Sartura Ltd. */ +#include <common.h> #include <command.h> #include <dm.h> #include <dm/test.h> diff --git a/test/cmd/test_echo.c b/test/cmd/test_echo.c index cde74ebeb61..091e4f823c9 100644 --- a/test/cmd/test_echo.c +++ b/test/cmd/test_echo.c @@ -5,6 +5,7 @@ * Copyright 2020, Heinrich Schuchadt <xypron.glpk@gmx.de> */ +#include <common.h> #include <command.h> #include <asm/global_data.h> #include <display_options.h> diff --git a/test/cmd/test_pause.c b/test/cmd/test_pause.c index 3703290350b..2b85cce3271 100644 --- a/test/cmd/test_pause.c +++ b/test/cmd/test_pause.c @@ -5,6 +5,7 @@ * Copyright 2022, Samuel Dionne-Riel <samuel@dionne-riel.com> */ +#include <common.h> #include <asm/global_data.h> #include <test/lib.h> #include <test/ut.h> diff --git a/test/cmd/wget.c b/test/cmd/wget.c index 356a4dcd8fa..ed83fc94a5e 100644 --- a/test/cmd/wget.c +++ b/test/cmd/wget.c @@ -6,6 +6,7 @@ * Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org> */ +#include <common.h> #include <command.h> #include <dm.h> #include <env.h> diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 4e4aa8f1cb2..0677ce0cd17 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -4,9 +4,9 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */ +#include <common.h> #include <command.h> #include <console.h> -#include <vsprintf.h> #include <test/suites.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/command_ut.c b/test/command_ut.c index 2b8d28d7ae3..a74bd109e15 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -5,6 +5,7 @@ #define DEBUG +#include <common.h> #include <command.h> #include <env.h> #include <log.h> diff --git a/test/common/cmd_ut_common.c b/test/common/cmd_ut_common.c index 2f03a58af47..2c0267801b2 100644 --- a/test/common/cmd_ut_common.c +++ b/test/common/cmd_ut_common.c @@ -6,6 +6,7 @@ * Unit tests for common functions */ +#include <common.h> #include <command.h> #include <test/common.h> #include <test/suites.h> diff --git a/test/common/cread.c b/test/common/cread.c index e159caed041..4edc7739604 100644 --- a/test/common/cread.c +++ b/test/common/cread.c @@ -3,8 +3,8 @@ * Copyright 2023 Google LLC */ +#include <common.h> #include <cli.h> -#include <time.h> #include <test/common.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/common/cyclic.c b/test/common/cyclic.c index 461f8cf91f4..6e758e89dbd 100644 --- a/test/common/cyclic.c +++ b/test/common/cyclic.c @@ -3,6 +3,7 @@ * Copyright (C) 2022 Stefan Roese <sr@denx.de> */ +#include <common.h> #include <cyclic.h> #include <dm.h> #include <test/common.h> diff --git a/test/common/event.c b/test/common/event.c index de433d34f22..b462694fc3b 100644 --- a/test/common/event.c +++ b/test/common/event.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <event.h> #include <test/common.h> diff --git a/test/common/test_autoboot.c b/test/common/test_autoboot.c index 4ba1dcc8091..42a1e4ab1fa 100644 --- a/test/common/test_autoboot.c +++ b/test/common/test_autoboot.c @@ -6,6 +6,7 @@ */ #include <autoboot.h> +#include <common.h> #include <test/common.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/compression.c b/test/compression.c index aa1d38bb7bc..3df90819a1f 100644 --- a/test/compression.c +++ b/test/compression.c @@ -3,6 +3,7 @@ * Copyright (c) 2013, The Chromium Authors */ +#include <common.h> #include <abuf.h> #include <bootm.h> #include <command.h> diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 4db2171a4b1..f14b3962f84 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <console.h> #include <dm.h> #include <malloc.h> diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c index 87bd8ae6749..44bcabda6bc 100644 --- a/test/dm/acpi_dp.c +++ b/test/dm/acpi_dp.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <uuid.h> #include <acpi/acpigen.h> diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c index 7113219792e..15b2b6f64a0 100644 --- a/test/dm/acpigen.c +++ b/test/dm/acpigen.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <irq.h> #include <malloc.h> diff --git a/test/dm/adc.c b/test/dm/adc.c index a26a677074a..740167e16b8 100644 --- a/test/dm/adc.c +++ b/test/dm/adc.c @@ -6,6 +6,7 @@ * Przemyslaw Marczak <p.marczak@samsung.com> */ +#include <common.h> #include <adc.h> #include <dm.h> #include <dm/root.h> diff --git a/test/dm/audio.c b/test/dm/audio.c index 3d1d821f323..add15ae20e0 100644 --- a/test/dm/audio.c +++ b/test/dm/audio.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <audio_codec.h> #include <dm.h> #include <dm/test.h> diff --git a/test/dm/axi.c b/test/dm/axi.c index 0900a9b5485..dc029df5e44 100644 --- a/test/dm/axi.c +++ b/test/dm/axi.c @@ -4,6 +4,7 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */ +#include <common.h> #include <axi.h> #include <dm.h> #include <log.h> diff --git a/test/dm/blk.c b/test/dm/blk.c index d03aec32f6c..799f1e4dc75 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <blk.h> #include <dm.h> #include <part.h> diff --git a/test/dm/blkmap.c b/test/dm/blkmap.c index 7581e62df3b..7a163d6eaef 100644 --- a/test/dm/blkmap.c +++ b/test/dm/blkmap.c @@ -4,6 +4,7 @@ * Author: Tobias Waldekranz <tobias@waldekranz.com> */ +#include <common.h> #include <blk.h> #include <blkmap.h> #include <dm.h> diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c index 9cfc7d48aac..b77b472d1f2 100644 --- a/test/dm/bootcount.c +++ b/test/dm/bootcount.c @@ -3,6 +3,7 @@ * (C) 2018 Theobroma Systems Design und Consulting GmbH */ +#include <common.h> #include <dm.h> #include <bootcount.h> #include <log.h> diff --git a/test/dm/bus.c b/test/dm/bus.c index a338c7f567c..89a6aa6554c 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -3,6 +3,7 @@ * Copyright (c) 2014 Google, Inc */ +#include <common.h> #ifdef CONFIG_SANDBOX #include <log.h> #include <os.h> diff --git a/test/dm/button.c b/test/dm/button.c index 9157ec92878..830d96fbef3 100644 --- a/test/dm/button.c +++ b/test/dm/button.c @@ -5,6 +5,7 @@ * Based on led.c */ +#include <common.h> #include <dm.h> #include <adc.h> #include <button.h> diff --git a/test/dm/cache.c b/test/dm/cache.c index d2f3bfe2caf..bbd8f98d007 100644 --- a/test/dm/cache.c +++ b/test/dm/cache.c @@ -3,6 +3,7 @@ * Copyright (C) 2019 Intel Corporation <www.intel.com> */ +#include <common.h> #include <dm.h> #include <dm/test.h> diff --git a/test/dm/clk.c b/test/dm/clk.c index a966471dbd9..57fabbdce08 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c index 15fba31b962..61dad8d8527 100644 --- a/test/dm/clk_ccf.c +++ b/test/dm/clk_ccf.c @@ -4,6 +4,7 @@ * Lukasz Majewski, DENX Software Engineering, lukma@denx.de */ +#include <common.h> #include <clk.h> #include <dm.h> #include <asm/clk.h> diff --git a/test/dm/core.c b/test/dm/core.c index 4741c81bcc1..7f3f8d183bc 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -5,6 +5,7 @@ * Copyright (c) 2013 Google, Inc */ +#include <common.h> #include <errno.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/cpu.c b/test/dm/cpu.c index acba8105996..5734cd0a92d 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -4,6 +4,7 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */ +#include <common.h> #include <dm.h> #include <log.h> #include <dm/test.h> diff --git a/test/dm/cros_ec.c b/test/dm/cros_ec.c index ac0055f0acd..30cb70e0882 100644 --- a/test/dm/cros_ec.c +++ b/test/dm/cros_ec.c @@ -3,6 +3,7 @@ * Copyright 2021 Google LLC */ +#include <common.h> #include <cros_ec.h> #include <dm.h> #include <asm/test.h> diff --git a/test/dm/cros_ec_pwm.c b/test/dm/cros_ec_pwm.c index f68ee6f33b8..f8d6e1e6c40 100644 --- a/test/dm/cros_ec_pwm.c +++ b/test/dm/cros_ec_pwm.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ +#include <common.h> #include <cros_ec.h> #include <dm.h> #include <pwm.h> diff --git a/test/dm/devres.c b/test/dm/devres.c index 95a470b9f1c..3df0f64362d 100644 --- a/test/dm/devres.c +++ b/test/dm/devres.c @@ -5,6 +5,7 @@ * Copyright 2019 Google LLC */ +#include <common.h> #include <errno.h> #include <dm.h> #include <log.h> diff --git a/test/dm/dma.c b/test/dm/dma.c index 949710fdb4e..cce47cb2180 100644 --- a/test/dm/dma.c +++ b/test/dm/dma.c @@ -6,6 +6,7 @@ * Grygorii Strashko <grygorii.strashko@ti.com> */ +#include <common.h> #include <dm.h> #include <malloc.h> #include <dm/test.h> diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c index 68686a40d9f..6e0a5df704f 100644 --- a/test/dm/dsi_host.c +++ b/test/dm/dsi_host.c @@ -4,6 +4,7 @@ * Author(s): Yannick Fertre <yannick.fertre@st.com> for STMicroelectronics. */ +#include <common.h> #include <dm.h> #include <dsi_host.h> #include <asm/state.h> diff --git a/test/dm/efi_media.c b/test/dm/efi_media.c index 9d0ed0f0755..e343a0e9c85 100644 --- a/test/dm/efi_media.c +++ b/test/dm/efi_media.c @@ -5,6 +5,7 @@ * Copyright 2021 Google LLC */ +#include <common.h> #include <dm.h> #include <asm/test.h> #include <dm/test.h> diff --git a/test/dm/eth.c b/test/dm/eth.c index 820b8cbfc29..bb3dcc6b954 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -6,6 +6,7 @@ * Joe Hershberger <joe.hershberger@ni.com> */ +#include <common.h> #include <dm.h> #include <env.h> #include <fdtdec.h> diff --git a/test/dm/fastboot.c b/test/dm/fastboot.c index 5d938eb7f12..758538d0e85 100644 --- a/test/dm/fastboot.c +++ b/test/dm/fastboot.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <fastboot.h> #include <fb_mmc.h> diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c index b484414f5f0..087d4846da8 100644 --- a/test/dm/fdtdec.c +++ b/test/dm/fdtdec.c @@ -3,6 +3,7 @@ * Copyright 2020 NXP */ +#include <common.h> #include <dm.h> #include <asm/global_data.h> #include <dm/of_extra.h> diff --git a/test/dm/ffa.c b/test/dm/ffa.c index fa6d54d00d6..6912666bb46 100644 --- a/test/dm/ffa.c +++ b/test/dm/ffa.c @@ -8,6 +8,7 @@ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> */ +#include <common.h> #include <console.h> #include <dm.h> #include <asm/sandbox_arm_ffa.h> diff --git a/test/dm/firmware.c b/test/dm/firmware.c index ec68e816999..f37bccfe4a8 100644 --- a/test/dm/firmware.c +++ b/test/dm/firmware.c @@ -3,6 +3,7 @@ * Copyright (C) 2018 Xilinx, Inc. */ +#include <common.h> #include <dm.h> #include <syscon.h> #include <asm/test.h> diff --git a/test/dm/fwu_mdata.c b/test/dm/fwu_mdata.c index 43ce3d0a9d8..52018f610fe 100644 --- a/test/dm/fwu_mdata.c +++ b/test/dm/fwu_mdata.c @@ -5,6 +5,7 @@ */ #include <blk.h> +#include <common.h> #include <dm.h> #include <fwu.h> #include <fwu_mdata.h> diff --git a/test/dm/gpio.c b/test/dm/gpio.c index 957ab25c8d3..0d88ec24bda 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -3,6 +3,7 @@ * Copyright (C) 2013 Google, Inc */ +#include <common.h> #include <fdtdec.h> #include <dm.h> #include <log.h> diff --git a/test/dm/host.c b/test/dm/host.c index e514f8409cf..ca05a36b313 100644 --- a/test/dm/host.c +++ b/test/dm/host.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <blk.h> #include <dm.h> #include <fs.h> diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c index a05b183b8bc..995759d4d7e 100644 --- a/test/dm/hwspinlock.c +++ b/test/dm/hwspinlock.c @@ -3,6 +3,7 @@ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ +#include <common.h> #include <dm.h> #include <hwspinlock.h> #include <asm/state.h> diff --git a/test/dm/i2c.c b/test/dm/i2c.c index e9cf9f7819a..b46a22e79b1 100644 --- a/test/dm/i2c.c +++ b/test/dm/i2c.c @@ -5,6 +5,7 @@ * Note: Test coverage does not include 10-bit addressing */ +#include <common.h> #include <dm.h> #include <fdtdec.h> #include <i2c.h> diff --git a/test/dm/i2s.c b/test/dm/i2s.c index a3d3a31b6fb..c2bf4d5604b 100644 --- a/test/dm/i2s.c +++ b/test/dm/i2s.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <i2s.h> #include <asm/test.h> diff --git a/test/dm/iommu.c b/test/dm/iommu.c index acea5f28971..62d38f1214a 100644 --- a/test/dm/iommu.c +++ b/test/dm/iommu.c @@ -3,6 +3,7 @@ * Copyright (C) 2021 Mark Kettenis <kettenis@openbsd.org> */ +#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/uclass-internal.h> diff --git a/test/dm/irq.c b/test/dm/irq.c index d22772ab769..51dd5e4abb4 100644 --- a/test/dm/irq.c +++ b/test/dm/irq.c @@ -5,6 +5,7 @@ * Copyright 2019 Google LLC */ +#include <common.h> #include <dm.h> #include <irq.h> #include <acpi/acpi_device.h> diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c index 2a581499634..354720f61e2 100644 --- a/test/dm/k210_pll.c +++ b/test/dm/k210_pll.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */ #include <div64.h> #include <dm/test.h> diff --git a/test/dm/led.c b/test/dm/led.c index c28fa044f45..eed3f4654c5 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <led.h> #include <asm/gpio.h> diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c index 14f72d58d1c..7ad8a1cbba2 100644 --- a/test/dm/mailbox.c +++ b/test/dm/mailbox.c @@ -3,6 +3,7 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */ +#include <common.h> #include <dm.h> #include <malloc.h> #include <dm/test.h> diff --git a/test/dm/mdio.c b/test/dm/mdio.c index 7ececf37ccc..f863c52645b 100644 --- a/test/dm/mdio.c +++ b/test/dm/mdio.c @@ -4,6 +4,7 @@ * Alex Marginean, NXP */ +#include <common.h> #include <dm.h> #include <log.h> #include <miiphy.h> diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c index 33a7e972609..bfe3518221f 100644 --- a/test/dm/mdio_mux.c +++ b/test/dm/mdio_mux.c @@ -4,6 +4,7 @@ * Alex Marginean, NXP */ +#include <common.h> #include <dm.h> #include <miiphy.h> #include <misc.h> diff --git a/test/dm/misc.c b/test/dm/misc.c index ad856fd01b6..8bdd8c64bca 100644 --- a/test/dm/misc.c +++ b/test/dm/misc.c @@ -4,6 +4,7 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */ +#include <common.h> #include <dm.h> #include <dm/test.h> #include <misc.h> diff --git a/test/dm/mmc.c b/test/dm/mmc.c index c0abea797d9..b1eb8bee2f9 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <mmc.h> #include <part.h> diff --git a/test/dm/mux-cmd.c b/test/dm/mux-cmd.c index d4bb8befa38..11c237b5da9 100644 --- a/test/dm/mux-cmd.c +++ b/test/dm/mux-cmd.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Texas Instruments Inc. * Pratyush Yadav <p.yadav@ti.com> */ +#include <common.h> #include <dm.h> #include <mux.h> #include <mux-internal.h> @@ -12,7 +13,6 @@ #include <test/ut.h> #include <console.h> #include <rand.h> -#include <time.h> #define BUF_SIZE 256 diff --git a/test/dm/mux-emul.c b/test/dm/mux-emul.c index febd521104a..c6aeeb7e1f1 100644 --- a/test/dm/mux-emul.c +++ b/test/dm/mux-emul.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ * Pratyush Yadav <p.yadav@ti.com> */ +#include <common.h> #include <dm.h> #include <mux.h> #include <mux-internal.h> diff --git a/test/dm/mux-mmio.c b/test/dm/mux-mmio.c index 3a871a19c7e..27c881dabde 100644 --- a/test/dm/mux-mmio.c +++ b/test/dm/mux-mmio.c @@ -4,6 +4,7 @@ * Jean-Jacques Hiblot <jjhiblot@ti.com> */ +#include <common.h> #include <dm.h> #include <mux.h> #include <regmap.h> diff --git a/test/dm/nop.c b/test/dm/nop.c index 0c79431d9d8..f7d9a0f3df3 100644 --- a/test/dm/nop.c +++ b/test/dm/nop.c @@ -6,6 +6,7 @@ * Jean-Jacques Hiblot <jjhiblot@ti.com> */ +#include <common.h> #include <dm.h> #include <dm/ofnode.h> #include <dm/lists.h> diff --git a/test/dm/nvmxip.c b/test/dm/nvmxip.c index 537959a0930..f0ad47d4efe 100644 --- a/test/dm/nvmxip.c +++ b/test/dm/nvmxip.c @@ -8,6 +8,7 @@ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> */ +#include <common.h> #include <blk.h> #include <console.h> #include <dm.h> diff --git a/test/dm/of_extra.c b/test/dm/of_extra.c index 3c31bfcd31f..ac2d886892d 100644 --- a/test/dm/of_extra.c +++ b/test/dm/of_extra.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <dm/of_extra.h> #include <dm/test.h> diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c index d4939e88516..a241c427936 100644 --- a/test/dm/of_platdata.c +++ b/test/dm/of_platdata.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ +#include <common.h> #include <clk.h> #include <dm.h> #include <dt-structs.h> diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 39191d7f52b..a5bc43aea4e 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -16,6 +16,7 @@ * behaviour of each ofnode function, since that is done by the normal ones. */ +#include <common.h> #include <abuf.h> #include <dm.h> #include <log.h> diff --git a/test/dm/ofread.c b/test/dm/ofread.c index 69d03c49107..3523860d2b3 100644 --- a/test/dm/ofread.c +++ b/test/dm/ofread.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ +#include <common.h> #include <dm.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/osd.c b/test/dm/osd.c index cf4a3a545ed..6279b391ca5 100644 --- a/test/dm/osd.c +++ b/test/dm/osd.c @@ -4,6 +4,7 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */ +#include <common.h> #include <display_options.h> #include <dm.h> #include <video_osd.h> diff --git a/test/dm/p2sb.c b/test/dm/p2sb.c index 3ada1fcb362..df24709141a 100644 --- a/test/dm/p2sb.c +++ b/test/dm/p2sb.c @@ -5,6 +5,7 @@ * Copyright 2019 Google LLC */ +#include <common.h> #include <dm.h> #include <p2sb.h> #include <asm/test.h> diff --git a/test/dm/panel.c b/test/dm/panel.c index 8be7c397a46..4d435a0d255 100644 --- a/test/dm/panel.c +++ b/test/dm/panel.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <backlight.h> #include <dm.h> #include <panel.h> diff --git a/test/dm/part.c b/test/dm/part.c index cabb31d18ca..d6e43458127 100644 --- a/test/dm/part.c +++ b/test/dm/part.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Sean Anderson <sean.anderson@seco.com> */ +#include <common.h> #include <dm.h> #include <mmc.h> #include <part.h> diff --git a/test/dm/pch.c b/test/dm/pch.c index b37b856d5da..53f7bbf180c 100644 --- a/test/dm/pch.c +++ b/test/dm/pch.c @@ -3,6 +3,7 @@ * Copyright 2018 Google LLC */ +#include <common.h> #include <dm.h> #include <pch.h> #include <asm/test.h> diff --git a/test/dm/pci.c b/test/dm/pci.c index 9b97f2e0544..8c5e7da9e62 100644 --- a/test/dm/pci.c +++ b/test/dm/pci.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <asm/io.h> #include <asm/test.h> diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c index e82fc53f84b..9941abd4ceb 100644 --- a/test/dm/pci_ep.c +++ b/test/dm/pci_ep.c @@ -3,6 +3,7 @@ * Copyright (C) 2019 Ramon Fried */ +#include <common.h> #include <dm.h> #include <hexdump.h> #include <pci_ep.h> diff --git a/test/dm/phy.c b/test/dm/phy.c index d14117f6f7a..0cf3689fdec 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -4,6 +4,7 @@ * Written by Jean-Jacques Hiblot <jjhiblot@ti.com> */ +#include <common.h> #include <dm.h> #include <generic-phy.h> #include <log.h> diff --git a/test/dm/phys2bus.c b/test/dm/phys2bus.c index 1ee2150482c..342f2fa8eba 100644 --- a/test/dm/phys2bus.c +++ b/test/dm/phys2bus.c @@ -3,6 +3,7 @@ * Copyright (c) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de> */ +#include <common.h> #include <dm.h> #include <mapmem.h> #include <phys2bus.h> diff --git a/test/dm/pinmux.c b/test/dm/pinmux.c index cfbe3ef5d1e..6880b2d2cd9 100644 --- a/test/dm/pinmux.c +++ b/test/dm/pinmux.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <dm.h> #include <dm/pinctrl.h> #include <dm/test.h> diff --git a/test/dm/pmc.c b/test/dm/pmc.c index bbad1ee2741..e70227e7800 100644 --- a/test/dm/pmc.c +++ b/test/dm/pmc.c @@ -5,6 +5,7 @@ * Copyright 2019 Google LLC */ +#include <common.h> #include <dm.h> #include <power/acpi_pmc.h> #include <dm/test.h> diff --git a/test/dm/pmic.c b/test/dm/pmic.c index 53a6f0369e8..ce671202fbc 100644 --- a/test/dm/pmic.c +++ b/test/dm/pmic.c @@ -6,6 +6,7 @@ * Przemyslaw Marczak <p.marczak@samsung.com> */ +#include <common.h> #include <errno.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c index 120a9059c8e..8604b5d72dc 100644 --- a/test/dm/power-domain.c +++ b/test/dm/power-domain.c @@ -3,6 +3,7 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */ +#include <common.h> #include <dm.h> #include <malloc.h> #include <dm/test.h> diff --git a/test/dm/pwm.c b/test/dm/pwm.c index 80133347ec7..dff626c771a 100644 --- a/test/dm/pwm.c +++ b/test/dm/pwm.c @@ -3,6 +3,7 @@ * Copyright (C) 2017 Google, Inc */ +#include <common.h> #include <dm.h> #include <pwm.h> #include <asm/test.h> diff --git a/test/dm/qfw.c b/test/dm/qfw.c index 3c354163ef3..f3f35689830 100644 --- a/test/dm/qfw.c +++ b/test/dm/qfw.c @@ -3,6 +3,7 @@ * Copyright 2021 Asherah Connor <ashe@kivikakk.ee> */ +#include <common.h> #include <qfw.h> #include <dm.h> #include <asm/test.h> diff --git a/test/dm/ram.c b/test/dm/ram.c index 188c7c32758..f624343138d 100644 --- a/test/dm/ram.c +++ b/test/dm/ram.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <ram.h> #include <asm/global_data.h> diff --git a/test/dm/read.c b/test/dm/read.c index 4ecf18110d0..7768aa29688 100644 --- a/test/dm/read.c +++ b/test/dm/read.c @@ -3,6 +3,7 @@ * Copyright (c) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de> */ +#include <common.h> #include <dm.h> #include <dm/device.h> #include <dm/ofnode.h> diff --git a/test/dm/reboot-mode.c b/test/dm/reboot-mode.c index 160b4da07f2..fbb9c3a5426 100644 --- a/test/dm/reboot-mode.c +++ b/test/dm/reboot-mode.c @@ -3,6 +3,7 @@ * (C) 2018 Theobroma Systems Design und Consulting GmbH */ +#include <common.h> #include <dm.h> #include <reboot-mode/reboot-mode.h> #include <env.h> diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 1398f8f6573..8560f2afc2d 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -3,13 +3,13 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <log.h> #include <mapmem.h> #include <regmap.h> #include <syscon.h> #include <rand.h> -#include <time.h> #include <asm/test.h> #include <dm/test.h> #include <dm/devres.h> diff --git a/test/dm/regulator.c b/test/dm/regulator.c index 9e45fd177b9..86f4862d9dd 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -6,6 +6,7 @@ * Przemyslaw Marczak <p.marczak@samsung.com> */ +#include <common.h> #include <errno.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c index ef9e8e5a0df..f6f9e509e27 100644 --- a/test/dm/remoteproc.c +++ b/test/dm/remoteproc.c @@ -3,8 +3,7 @@ * (C) Copyright 2015 * Texas Instruments Incorporated - https://www.ti.com/ */ - -#include <config.h> +#include <common.h> #include <dm.h> #include <elf.h> #include <errno.h> diff --git a/test/dm/reset.c b/test/dm/reset.c index d3158bf4a72..e2d6f456230 100644 --- a/test/dm/reset.c +++ b/test/dm/reset.c @@ -3,6 +3,7 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */ +#include <common.h> #include <dm.h> #include <dm/device-internal.h> #include <log.h> diff --git a/test/dm/rkmtd.c b/test/dm/rkmtd.c index 3dc9ca1add1..3c3e8efa92f 100644 --- a/test/dm/rkmtd.c +++ b/test/dm/rkmtd.c @@ -8,6 +8,7 @@ * Copyright (C) 2023 Johan Jonker <jbx6244@gmail.com> */ +#include <common.h> #include <blk.h> #include <dm.h> #include <fs.h> diff --git a/test/dm/rng.c b/test/dm/rng.c index c8ed6cadf58..6d1f68848d5 100644 --- a/test/dm/rng.c +++ b/test/dm/rng.c @@ -3,6 +3,7 @@ * Copyright (c) 2019, Linaro Limited */ +#include <common.h> #include <dm.h> #include <log.h> #include <rng.h> diff --git a/test/dm/rtc.c b/test/dm/rtc.c index a8aa41955c2..bf97dbbd2f9 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <console.h> #include <dm.h> #include <i2c.h> diff --git a/test/dm/scmi.c b/test/dm/scmi.c index 69fc900e342..adf36ffaab1 100644 --- a/test/dm/scmi.c +++ b/test/dm/scmi.c @@ -12,6 +12,7 @@ * unknown SCMI protocol ID. */ +#include <common.h> #include <clk.h> #include <dm.h> #include <reset.h> diff --git a/test/dm/scsi.c b/test/dm/scsi.c index 5180159fb27..380cfc88bab 100644 --- a/test/dm/scsi.c +++ b/test/dm/scsi.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <part.h> #include <scsi.h> diff --git a/test/dm/serial.c b/test/dm/serial.c index 34c0d4db879..34b783e062e 100644 --- a/test/dm/serial.c +++ b/test/dm/serial.c @@ -3,6 +3,7 @@ * Copyright (c) 2018, STMicroelectronics */ +#include <common.h> #include <log.h> #include <serial.h> #include <dm.h> diff --git a/test/dm/sf.c b/test/dm/sf.c index 0e3a0f13f9e..17d43fef3bc 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -3,6 +3,7 @@ * Copyright (C) 2013 Google, Inc */ +#include <common.h> #include <command.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/simple-bus.c b/test/dm/simple-bus.c index 8a730ba2fce..3530b47fac2 100644 --- a/test/dm/simple-bus.c +++ b/test/dm/simple-bus.c @@ -3,6 +3,7 @@ * Copyright (C) 2021, Bin Meng <bmeng.cn@gmail.com> */ +#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/simple_bus.h> diff --git a/test/dm/simple-pm-bus.c b/test/dm/simple-pm-bus.c index 9949cb34d59..792c7450580 100644 --- a/test/dm/simple-pm-bus.c +++ b/test/dm/simple-pm-bus.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/device-internal.h> diff --git a/test/dm/sm.c b/test/dm/sm.c index 4d95c2ad75b..7ebb0c9c85e 100644 --- a/test/dm/sm.c +++ b/test/dm/sm.c @@ -5,6 +5,7 @@ * Author: Alexey Romanov <avromanov@salutedevices.com> */ +#include <common.h> #include <dm.h> #include <sm.h> #include <sandbox-sm.h> diff --git a/test/dm/smem.c b/test/dm/smem.c index adcbfe574ab..289fb59ba13 100644 --- a/test/dm/smem.c +++ b/test/dm/smem.c @@ -3,6 +3,7 @@ * Copyright (C) 2018 Ramon Fried <ramon.fried@gmail.com> */ +#include <common.h> #include <dm.h> #include <smem.h> #include <dm/test.h> diff --git a/test/dm/soc.c b/test/dm/soc.c index cb0ac1545f7..8f6c97fa790 100644 --- a/test/dm/soc.c +++ b/test/dm/soc.c @@ -6,6 +6,7 @@ * Dave Gerlach <d-gerlach@ti.com> */ +#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/uclass-internal.h> diff --git a/test/dm/sound.c b/test/dm/sound.c index f4e6215e683..15d545ab5a3 100644 --- a/test/dm/sound.c +++ b/test/dm/sound.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <sound.h> #include <dm/test.h> diff --git a/test/dm/spi.c b/test/dm/spi.c index 1ab2dd78324..325799bbf10 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -3,6 +3,7 @@ * Copyright (C) 2013 Google, Inc */ +#include <common.h> #include <dm.h> #include <fdtdec.h> #include <spi.h> diff --git a/test/dm/spmi.c b/test/dm/spmi.c index e10ae8db4d3..97bb0eb30fc 100644 --- a/test/dm/spmi.c +++ b/test/dm/spmi.c @@ -3,6 +3,7 @@ * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com> */ +#include <common.h> #include <fdtdec.h> #include <dm.h> #include <malloc.h> diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c index ba19504573f..eeaddf88392 100644 --- a/test/dm/syscon-reset.c +++ b/test/dm/syscon-reset.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <dm.h> #include <dm/test.h> #include <regmap.h> diff --git a/test/dm/syscon.c b/test/dm/syscon.c index 04d324e87d4..be232972336 100644 --- a/test/dm/syscon.c +++ b/test/dm/syscon.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <log.h> #include <syscon.h> diff --git a/test/dm/sysinfo-gpio.c b/test/dm/sysinfo-gpio.c index 24a99dafb15..2e494b3f341 100644 --- a/test/dm/sysinfo-gpio.c +++ b/test/dm/sysinfo-gpio.c @@ -3,6 +3,7 @@ * Copyright (C) 2021 Sean Anderson <sean.anderson@seco.com> */ +#include <common.h> #include <dm.h> #include <log.h> #include <sysinfo.h> diff --git a/test/dm/sysinfo.c b/test/dm/sysinfo.c index 7444a580df6..96b3a8ebaba 100644 --- a/test/dm/sysinfo.c +++ b/test/dm/sysinfo.c @@ -4,6 +4,7 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */ +#include <common.h> #include <dm.h> #include <log.h> #include <dm/test.h> diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index f3a859be787..5aa69e04618 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <sysreset.h> #include <asm/state.h> diff --git a/test/dm/tag.c b/test/dm/tag.c index bce8a35acfb..8ae8a1fcd65 100644 --- a/test/dm/tag.c +++ b/test/dm/tag.c @@ -6,6 +6,7 @@ * Author: AKASHI Takahiro */ +#include <common.h> #include <dm/tag.h> #include <dm/test.h> /* DM_TEST() */ #include <test/test.h> /* struct unit_test_state */ diff --git a/test/dm/tee.c b/test/dm/tee.c index bb02a9b3c98..7a11bf89138 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -3,6 +3,7 @@ * Copyright (C) 2018 Linaro Limited */ +#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index 4bc2c45db61..e73a1dd8f81 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -3,6 +3,7 @@ * Copyright (c) 2013 Google, Inc */ +#include <common.h> #include <test/suites.h> #include <test/test.h> diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 851177c3018..02cb974b0f7 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -6,6 +6,7 @@ * Pavel Herrmann <morpheus.ibis@gmail.com> */ +#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 18c89eef43f..72d0eb57e21 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -3,6 +3,7 @@ * Copyright (c) 2013 Google, Inc */ +#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 9a80cc63667..067701734a0 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -6,6 +6,7 @@ * Pavel Herrmann <morpheus.ibis@gmail.com> */ +#include <common.h> #include <log.h> #include <malloc.h> #include <dm.h> diff --git a/test/dm/timer.c b/test/dm/timer.c index 7fcefc42e59..9f94d476920 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw> */ +#include <common.h> #include <dm.h> #include <timer.h> #include <dm/test.h> diff --git a/test/dm/tpm.c b/test/dm/tpm.c index 0e413c0eedd..cde933ab284 100644 --- a/test/dm/tpm.c +++ b/test/dm/tpm.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <tpm_api.h> #include <dm/test.h> diff --git a/test/dm/usb.c b/test/dm/usb.c index 9a571938b81..7671ef156d8 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Google, Inc */ +#include <common.h> #include <console.h> #include <dm.h> #include <part.h> diff --git a/test/dm/video.c b/test/dm/video.c index 7dfbeb9555d..d907f681600 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <bzlib.h> #include <dm.h> #include <gzip.h> diff --git a/test/dm/virtio.c b/test/dm/virtio.c index 3efd7c74f42..3e108cdc35d 100644 --- a/test/dm/virtio.c +++ b/test/dm/virtio.c @@ -3,6 +3,7 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> */ +#include <common.h> #include <dm.h> #include <virtio_types.h> #include <virtio.h> diff --git a/test/dm/virtio_device.c b/test/dm/virtio_device.c index 63dc53415b7..fdda4da4178 100644 --- a/test/dm/virtio_device.c +++ b/test/dm/virtio_device.c @@ -3,6 +3,7 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> */ +#include <common.h> #include <dm.h> #include <virtio_types.h> #include <virtio.h> diff --git a/test/dm/virtio_rng.c b/test/dm/virtio_rng.c index ab7d862d79e..8b9a04b1fde 100644 --- a/test/dm/virtio_rng.c +++ b/test/dm/virtio_rng.c @@ -4,6 +4,7 @@ * Written by Andrew Scull <ascull@google.com> */ +#include <common.h> #include <dm.h> #include <virtio_types.h> #include <virtio.h> diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 1df2da23c6c..2bbebcdbf28 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -3,9 +3,9 @@ * Copyright 2017 Google, Inc */ +#include <common.h> #include <cyclic.h> #include <dm.h> -#include <time.h> #include <wdt.h> #include <asm/gpio.h> #include <asm/state.h> diff --git a/test/env/attr.c b/test/env/attr.c index de5d5d4ee27..8d5c0f1c3df 100644 --- a/test/env/attr.c +++ b/test/env/attr.c @@ -4,6 +4,7 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */ +#include <common.h> #include <command.h> #include <env_attr.h> #include <test/env.h> diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c index 13e0998341e..d65a32179ce 100644 --- a/test/env/cmd_ut_env.c +++ b/test/env/cmd_ut_env.c @@ -4,6 +4,7 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */ +#include <common.h> #include <command.h> #include <test/env.h> #include <test/suites.h> diff --git a/test/env/fdt.c b/test/env/fdt.c index c495ac7b307..30bfa88c355 100644 --- a/test/env/fdt.c +++ b/test/env/fdt.c @@ -1,3 +1,4 @@ +#include <common.h> #include <command.h> #include <env_attr.h> #include <test/env.h> diff --git a/test/env/hashtable.c b/test/env/hashtable.c index ccdf0138c4b..70102f9121c 100644 --- a/test/env/hashtable.c +++ b/test/env/hashtable.c @@ -4,11 +4,11 @@ * Roman Kapl, SYSGO, rka@sysgo.com */ +#include <common.h> #include <command.h> #include <log.h> #include <search.h> #include <stdio.h> -#include <vsprintf.h> #include <test/env.h> #include <test/ut.h> diff --git a/test/fuzz/cmd_fuzz.c b/test/fuzz/cmd_fuzz.c index faa140433ff..d0bc7b8d7b7 100644 --- a/test/fuzz/cmd_fuzz.c +++ b/test/fuzz/cmd_fuzz.c @@ -5,6 +5,7 @@ */ #include <command.h> +#include <common.h> #include <dm.h> #include <fuzzing_engine.h> #include <test/fuzz.h> diff --git a/test/fuzz/virtio.c b/test/fuzz/virtio.c index 836eb9a2f66..8a47667e778 100644 --- a/test/fuzz/virtio.c +++ b/test/fuzz/virtio.c @@ -4,6 +4,7 @@ * Written by Andrew Scull <ascull@google.com> */ +#include <common.h> #include <dm.h> #include <virtio.h> #include <virtio_ring.h> diff --git a/test/image/spl_load.c b/test/image/spl_load.c index 7cbad40ea0c..e1036eff28c 100644 --- a/test/image/spl_load.c +++ b/test/image/spl_load.c @@ -3,6 +3,7 @@ * Copyright (C) 2023 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <image.h> #include <imx_container.h> #include <mapmem.h> diff --git a/test/image/spl_load_fs.c b/test/image/spl_load_fs.c index 935078bf67b..a89189e1124 100644 --- a/test/image/spl_load_fs.c +++ b/test/image/spl_load_fs.c @@ -3,6 +3,7 @@ * Copyright (C) 2023 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <blk.h> #include <ext_common.h> #include <ext4fs.h> diff --git a/test/image/spl_load_net.c b/test/image/spl_load_net.c index 4af6e21b8b9..9d067a7a592 100644 --- a/test/image/spl_load_net.c +++ b/test/image/spl_load_net.c @@ -3,6 +3,7 @@ * Copyright (C) 2023 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <dm.h> #include <spl.h> #include <test/spl.h> diff --git a/test/image/spl_load_nor.c b/test/image/spl_load_nor.c index f53a6724e27..de5686343b9 100644 --- a/test/image/spl_load_nor.c +++ b/test/image/spl_load_nor.c @@ -3,6 +3,7 @@ * Copyright (C) 2023 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <dm.h> #include <spl.h> #include <asm/io.h> diff --git a/test/image/spl_load_os.c b/test/image/spl_load_os.c index 7d5fb9b07e0..26228a8a4a9 100644 --- a/test/image/spl_load_os.c +++ b/test/image/spl_load_os.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <image.h> #include <os.h> #include <spl.h> diff --git a/test/image/spl_load_spi.c b/test/image/spl_load_spi.c index 80836dc0dff..54a95465e23 100644 --- a/test/image/spl_load_spi.c +++ b/test/image/spl_load_spi.c @@ -3,6 +3,7 @@ * Copyright (C) 2023 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <dm.h> #include <spi_flash.h> #include <spl.h> diff --git a/test/lib/abuf.c b/test/lib/abuf.c index 7c0481ab610..42803b20e2a 100644 --- a/test/lib/abuf.c +++ b/test/lib/abuf.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <abuf.h> #include <mapmem.h> #include <test/lib.h> diff --git a/test/lib/asn1.c b/test/lib/asn1.c index 4842b7058ac..a66cdd77df0 100644 --- a/test/lib/asn1.c +++ b/test/lib/asn1.c @@ -6,6 +6,7 @@ * Unit test for asn1 compiler and asn1 decoder function via various parsers */ +#include <common.h> #include <command.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c index f98cb9b3c57..f1ac015b2c8 100644 --- a/test/lib/cmd_ut_lib.c +++ b/test/lib/cmd_ut_lib.c @@ -5,6 +5,7 @@ * Unit tests for library functions */ +#include <common.h> #include <command.h> #include <test/lib.h> #include <test/suites.h> diff --git a/test/lib/efi_device_path.c b/test/lib/efi_device_path.c index 290c8768fa4..24e2f23c5af 100644 --- a/test/lib/efi_device_path.c +++ b/test/lib/efi_device_path.c @@ -5,6 +5,7 @@ * Copyright (c) 2020 Heinrich Schuchardt <xypron.glpk@gmx.de> */ +#include <common.h> #include <efi_loader.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/efi_image_region.c b/test/lib/efi_image_region.c index 3ca49dc4a2e..0b888f84337 100644 --- a/test/lib/efi_image_region.c +++ b/test/lib/efi_image_region.c @@ -3,6 +3,7 @@ * (C) Copyright 2020, Heinrich Schuchardt <xypron.glpk@gmx.de> */ +#include <common.h> #include <efi_loader.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/getopt.c b/test/lib/getopt.c index 388a076200b..3c68b93c8a5 100644 --- a/test/lib/getopt.c +++ b/test/lib/getopt.c @@ -6,6 +6,7 @@ * posix/tst-getopt-cancel.c */ +#include <common.h> #include <getopt.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/hexdump.c b/test/lib/hexdump.c index d531a830398..5dccf438866 100644 --- a/test/lib/hexdump.c +++ b/test/lib/hexdump.c @@ -4,6 +4,7 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */ +#include <common.h> #include <hexdump.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/kconfig.c b/test/lib/kconfig.c index 0c463bb794a..3914f699659 100644 --- a/test/lib/kconfig.c +++ b/test/lib/kconfig.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/kconfig_spl.c b/test/lib/kconfig_spl.c index 3bd8abdf4b8..8f8a3411b14 100644 --- a/test/lib/kconfig_spl.c +++ b/test/lib/kconfig_spl.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 4b5b6e5e209..7e4368de22e 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -3,6 +3,7 @@ * (C) Copyright 2018 Simon Goldschmidt */ +#include <common.h> #include <dm.h> #include <lmb.h> #include <log.h> diff --git a/test/lib/longjmp.c b/test/lib/longjmp.c index 79d889bdd5f..201367a5a3a 100644 --- a/test/lib/longjmp.c +++ b/test/lib/longjmp.c @@ -5,6 +5,7 @@ * Copyright (c) 2021, Heinrich Schuchardt <xypron.glpk@gmx.de> */ +#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/rsa.c b/test/lib/rsa.c index 40f70010c78..44f8ade226f 100644 --- a/test/lib/rsa.c +++ b/test/lib/rsa.c @@ -6,6 +6,7 @@ * Unit test for rsa_verify() function */ +#include <common.h> #include <command.h> #include <image.h> #include <test/lib.h> diff --git a/test/lib/sscanf.c b/test/lib/sscanf.c index 9fe5521749f..772e4b92042 100644 --- a/test/lib/sscanf.c +++ b/test/lib/sscanf.c @@ -9,6 +9,7 @@ * Unit tests for sscanf() function */ +#include <common.h> #include <command.h> #include <log.h> #include <test/lib.h> diff --git a/test/lib/string.c b/test/lib/string.c index d08dbca9291..5dcf4d6db00 100644 --- a/test/lib/string.c +++ b/test/lib/string.c @@ -9,6 +9,7 @@ * This has to be considered in testing. */ +#include <common.h> #include <command.h> #include <log.h> #include <test/lib.h> diff --git a/test/lib/strlcat.c b/test/lib/strlcat.c index d1a0293271b..d8453fe78e2 100644 --- a/test/lib/strlcat.c +++ b/test/lib/strlcat.c @@ -6,6 +6,7 @@ * These tests adapted from glibc's string/test-strncat.c */ +#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c index cfd9d8ca5a9..cbc712f7eda 100644 --- a/test/lib/test_aes.c +++ b/test/lib/test_aes.c @@ -5,6 +5,7 @@ * Unit tests for aes functions */ +#include <common.h> #include <command.h> #include <hexdump.h> #include <rand.h> diff --git a/test/lib/test_crypt.c b/test/lib/test_crypt.c index dcdadd992c1..fb21edf9748 100644 --- a/test/lib/test_crypt.c +++ b/test/lib/test_crypt.c @@ -5,6 +5,7 @@ * Unit test for crypt-style password hashing */ +#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/test_errno_str.c b/test/lib/test_errno_str.c index 67f76442b27..8a9f1fd9805 100644 --- a/test/lib/test_errno_str.c +++ b/test/lib/test_errno_str.c @@ -9,6 +9,7 @@ * This has to be considered in testing. */ +#include <common.h> #include <command.h> #include <errno.h> #include <test/lib.h> diff --git a/test/lib/test_print.c b/test/lib/test_print.c index c7fc50a1de1..79b67c77932 100644 --- a/test/lib/test_print.c +++ b/test/lib/test_print.c @@ -5,6 +5,7 @@ * Copyright 2020, Heinrich Schuchadt <xypron.glpk@gmx.de> */ +#include <common.h> #include <command.h> #include <display_options.h> #include <asm/global_data.h> diff --git a/test/lib/uuid.c b/test/lib/uuid.c index 0914f2c47e7..e24331a1366 100644 --- a/test/lib/uuid.c +++ b/test/lib/uuid.c @@ -8,6 +8,7 @@ * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> */ +#include <common.h> #include <uuid.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/log/cont_test.c b/test/log/cont_test.c index 036d44b9d73..de7b7f064cd 100644 --- a/test/log/cont_test.c +++ b/test/log/cont_test.c @@ -5,6 +5,7 @@ * Test continuation of log messages. */ +#include <common.h> #include <console.h> #include <asm/global_data.h> #include <test/log.h> diff --git a/test/log/log_filter.c b/test/log/log_filter.c index 9cc891dc48c..b644b40a850 100644 --- a/test/log/log_filter.c +++ b/test/log/log_filter.c @@ -3,6 +3,7 @@ * Copyright (C) 2020 Sean Anderson <seanga2@gmail.com> */ +#include <common.h> #include <console.h> #include <log.h> #include <asm/global_data.h> diff --git a/test/log/log_test.c b/test/log/log_test.c index 855353a9c40..c5abff80d11 100644 --- a/test/log/log_test.c +++ b/test/log/log_test.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <command.h> #include <log.h> #include <asm/global_data.h> diff --git a/test/log/log_ut.c b/test/log/log_ut.c index 6617ed8b152..5aa3a184004 100644 --- a/test/log/log_ut.c +++ b/test/log/log_ut.c @@ -5,6 +5,7 @@ * Logging function tests. */ +#include <common.h> #include <console.h> #include <log.h> #include <test/log.h> diff --git a/test/log/nolog_ndebug.c b/test/log/nolog_ndebug.c index b714a16d2e7..bd9a4f408e7 100644 --- a/test/log/nolog_ndebug.c +++ b/test/log/nolog_ndebug.c @@ -5,6 +5,7 @@ * Logging function tests for CONFIG_LOG=n without #define DEBUG */ +#include <common.h> #include <console.h> #include <log.h> #include <asm/global_data.h> diff --git a/test/log/nolog_test.c b/test/log/nolog_test.c index c4c0fa6cf81..4e52e5bed82 100644 --- a/test/log/nolog_test.c +++ b/test/log/nolog_test.c @@ -8,6 +8,7 @@ /* Needed for testing log_debug() */ #define DEBUG 1 +#include <common.h> #include <console.h> #include <log.h> #include <asm/global_data.h> diff --git a/test/log/pr_cont_test.c b/test/log/pr_cont_test.c index 30f30d98fe1..df4520d2807 100644 --- a/test/log/pr_cont_test.c +++ b/test/log/pr_cont_test.c @@ -5,6 +5,7 @@ * Test continuation of log messages using pr_cont(). */ +#include <common.h> #include <console.h> #include <test/log.h> #include <test/test.h> diff --git a/test/log/syslog_test.c b/test/log/syslog_test.c index c4180f775b9..4db649db822 100644 --- a/test/log/syslog_test.c +++ b/test/log/syslog_test.c @@ -10,6 +10,7 @@ /* Override CONFIG_LOG_MAX_LEVEL */ #define LOG_DEBUG +#include <common.h> #include <asm/global_data.h> #include <dm/device.h> #include <hexdump.h> diff --git a/test/log/syslog_test_ndebug.c b/test/log/syslog_test_ndebug.c index b10e636812b..4438791044d 100644 --- a/test/log/syslog_test_ndebug.c +++ b/test/log/syslog_test_ndebug.c @@ -7,6 +7,7 @@ * Invoke the test with: ./u-boot -d arch/sandbox/dts/test.dtb */ +#include <common.h> #include <asm/global_data.h> #include <dm/device.h> #include <hexdump.h> diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c index c6f50e0995a..c3887ab11d9 100644 --- a/test/optee/cmd_ut_optee.c +++ b/test/optee/cmd_ut_optee.c @@ -3,6 +3,7 @@ * Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH */ +#include <common.h> #include <command.h> #include <errno.h> #include <fdt_support.h> diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c index bcb29a26e21..56a3df17138 100644 --- a/test/overlay/cmd_ut_overlay.c +++ b/test/overlay/cmd_ut_overlay.c @@ -4,6 +4,7 @@ * Copyright (c) 2016 Free Electrons */ +#include <common.h> #include <command.h> #include <errno.h> #include <fdt_support.h> diff --git a/test/print_ut.c b/test/print_ut.c index bded2b6ebe5..bb844d2542b 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -3,6 +3,7 @@ * Copyright (c) 2012, The Chromium Authors */ +#include <common.h> #include <command.h> #include <efi_api.h> #include <display_options.h> diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 3e01be11029..26b6de07f88 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -17,6 +17,7 @@ import u_boot_spawn # Regexes for text we expect U-Boot to send to the console. pattern_u_boot_spl_signon = re.compile('(U-Boot SPL \\d{4}\\.\\d{2}[^\r\n]*\\))') +pattern_u_boot_spl2_signon = re.compile('(U-Boot SPL \\d{4}\\.\\d{2}[^\r\n]*\\))') pattern_u_boot_main_signon = re.compile('(U-Boot \\d{4}\\.\\d{2}[^\r\n]*\\))') pattern_stop_autoboot_prompt = re.compile('Hit any key to stop autoboot: ') pattern_unknown_command = re.compile('Unknown command \'.*\' - try \'help\'') @@ -28,6 +29,7 @@ PAT_RE = 1 bad_pattern_defs = ( ('spl_signon', pattern_u_boot_spl_signon), + ('spl2_signon', pattern_u_boot_spl2_signon), ('main_signon', pattern_u_boot_main_signon), ('stop_autoboot_prompt', pattern_stop_autoboot_prompt), ('unknown_command', pattern_unknown_command), @@ -150,20 +152,25 @@ class ConsoleBase(object): """ try: bcfg = self.config.buildconfig + config_spl = bcfg.get('config_spl', 'n') == 'y' config_spl_serial = bcfg.get('config_spl_serial', 'n') == 'y' env_spl_skipped = self.config.env.get('env__spl_skipped', False) - env_spl_banner_times = self.config.env.get('env__spl_banner_times', 1) + env_spl2_skipped = self.config.env.get('env__spl2_skipped', True) while loop_num > 0: loop_num -= 1 - while config_spl_serial and not env_spl_skipped and env_spl_banner_times > 0: + if config_spl and config_spl_serial and not env_spl_skipped: m = self.p.expect([pattern_u_boot_spl_signon] + self.bad_patterns) if m != 0: raise Exception('Bad pattern found on SPL console: ' + self.bad_pattern_ids[m - 1]) - env_spl_banner_times -= 1 - + if not env_spl2_skipped: + m = self.p.expect([pattern_u_boot_spl2_signon] + + self.bad_patterns) + if m != 0: + raise Exception('Bad pattern found on SPL2 console: ' + + self.bad_pattern_ids[m - 1]) m = self.p.expect([pattern_u_boot_main_signon] + self.bad_patterns) if m != 0: raise Exception('Bad pattern found on console: ' + diff --git a/test/stdint/int-types.c b/test/stdint/int-types.c index 9051e32c7ce..f6d09e8643d 100644 --- a/test/stdint/int-types.c +++ b/test/stdint/int-types.c @@ -1,4 +1,4 @@ -#include <linux/types.h> +#include <common.h> int test_types(void) { diff --git a/test/str_ut.c b/test/str_ut.c index 389779859a3..fa9328ede50 100644 --- a/test/str_ut.c +++ b/test/str_ut.c @@ -3,6 +3,7 @@ * Copyright 2020 Google LLC */ +#include <common.h> #include <vsprintf.h> #include <test/suites.h> #include <test/test.h> diff --git a/test/test-main.c b/test/test-main.c index 3fa6f6e32ec..b7015d9f38d 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <blk.h> #include <console.h> #include <cyclic.h> diff --git a/test/time_ut.c b/test/time_ut.c index 149c4b58f4a..80b82dbfd83 100644 --- a/test/time_ut.c +++ b/test/time_ut.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <command.h> #include <errno.h> #include <time.h> diff --git a/test/unicode_ut.c b/test/unicode_ut.c index 13e29c9b9e3..47c3f52774c 100644 --- a/test/unicode_ut.c +++ b/test/unicode_ut.c @@ -5,6 +5,7 @@ * Copyright (c) 2018 Heinrich Schuchardt <xypron.glpk@gmx.de> */ +#include <common.h> #include <charset.h> #include <command.h> #include <efi_loader.h> diff --git a/test/ut.c b/test/ut.c index ae99831ac8f..628e9dc9805 100644 --- a/test/ut.c +++ b/test/ut.c @@ -5,6 +5,7 @@ * Copyright (c) 2013 Google, Inc */ +#include <common.h> #include <console.h> #include <malloc.h> #ifdef CONFIG_SANDBOX |