[U-Boot] [PATCH 10/30] dm: core: Drop header files from dm/test.h

These header file should not be included in other header files. Remove them and add to each individual file.

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

include/dm/test.h | 3 --- test/dm/adc.c | 1 + test/dm/audio.c | 1 + test/dm/axi.c | 3 ++- test/dm/blk.c | 1 + test/dm/board.c | 1 + test/dm/bootcount.c | 1 + test/dm/bus.c | 1 + test/dm/clk.c | 1 + test/dm/clk_ccf.c | 1 + test/dm/core.c | 1 + test/dm/cpu.c | 1 + test/dm/dma.c | 1 + test/dm/dsi_host.c | 1 + test/dm/eth.c | 3 ++- test/dm/firmware.c | 1 + test/dm/gpio.c | 3 ++- test/dm/hwspinlock.c | 1 + test/dm/i2c.c | 1 + test/dm/i2s.c | 3 ++- test/dm/led.c | 1 + test/dm/mailbox.c | 1 + test/dm/mdio.c | 5 +++-- test/dm/mdio_mux.c | 5 +++-- test/dm/misc.c | 1 + test/dm/mmc.c | 1 + test/dm/nop.c | 1 + test/dm/ofnode.c | 1 + test/dm/osd.c | 5 +++-- test/dm/panel.c | 3 ++- test/dm/pch.c | 1 + test/dm/pci.c | 1 + test/dm/pci_ep.c | 5 +++-- test/dm/phy.c | 1 + test/dm/pmic.c | 5 +++-- test/dm/power-domain.c | 1 + test/dm/pwm.c | 1 + test/dm/ram.c | 1 + test/dm/regmap.c | 1 + test/dm/regulator.c | 1 + test/dm/remoteproc.c | 2 ++ test/dm/reset.c | 1 + test/dm/rtc.c | 1 + test/dm/serial.c | 1 + test/dm/sf.c | 1 + test/dm/smem.c | 1 + test/dm/sound.c | 1 + test/dm/spi.c | 1 + test/dm/spmi.c | 1 + test/dm/syscon.c | 1 + test/dm/sysreset.c | 1 + test/dm/tee.c | 1 + test/dm/test-driver.c | 3 ++- test/dm/test-fdt.c | 1 + test/dm/test-main.c | 2 ++ test/dm/test-uclass.c | 1 + test/dm/timer.c | 1 + test/dm/usb.c | 1 + test/dm/video.c | 1 + test/dm/virtio.c | 3 ++- test/dm/wdt.c | 1 + test/lib/lmb.c | 2 ++ 62 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/include/dm/test.h b/include/dm/test.h index 07385cd531..b528b35617 100644 --- a/include/dm/test.h +++ b/include/dm/test.h @@ -6,9 +6,6 @@ #ifndef __DM_TEST_H #define __DM_TEST_H

-#include <dm.h> -#include <test/test.h> - /** * struct dm_test_cdata - configuration data for test instance * diff --git a/test/dm/adc.c b/test/dm/adc.c index da7bd4bf1f..7fa1d48dd9 100644 --- a/test/dm/adc.c +++ b/test/dm/adc.c @@ -17,6 +17,7 @@ #include <power/regulator.h> #include <power/sandbox_pmic.h> #include <sandbox-adc.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_adc_bind(struct unit_test_state *uts) diff --git a/test/dm/audio.c b/test/dm/audio.c index 77c3a3625b..4bb86e3214 100644 --- a/test/dm/audio.c +++ b/test/dm/audio.c @@ -8,6 +8,7 @@ #include <audio_codec.h> #include <dm.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h> #include <asm/test.h>

diff --git a/test/dm/axi.c b/test/dm/axi.c index e234ab82e6..d84dfdeb4b 100644 --- a/test/dm/axi.c +++ b/test/dm/axi.c @@ -7,9 +7,10 @@ #include <common.h> #include <axi.h> #include <dm.h> +#include <asm/axi.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h> -#include <asm/axi.h>

/* Test that sandbox AXI works correctly */ static int dm_test_axi_base(struct unit_test_state *uts) diff --git a/test/dm/blk.c b/test/dm/blk.c index 9c71adc69d..e1a40a31d4 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -8,6 +8,7 @@ #include <usb.h> #include <asm/state.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/board.c b/test/dm/board.c index 0f267a1926..f3fd51cac8 100644 --- a/test/dm/board.c +++ b/test/dm/board.c @@ -8,6 +8,7 @@ #include <dm.h> #include <dm/test.h> #include <board.h> +#include <test/test.h> #include <test/ut.h>

#include "../../drivers/board/sandbox.h" diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c index 0817b7d3ec..2d2aac6674 100644 --- a/test/dm/bootcount.c +++ b/test/dm/bootcount.c @@ -8,6 +8,7 @@ #include <bootcount.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_bootcount(struct unit_test_state *uts) diff --git a/test/dm/bus.c b/test/dm/bus.c index 1ad45adb60..f0e1cae7fc 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -13,6 +13,7 @@ #include <dm/test.h> #include <dm/uclass-internal.h> #include <dm/util.h> +#include <test/test.h> #include <test/ut.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/clk.c b/test/dm/clk.c index 676ef217f0..abb6531b50 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -9,6 +9,7 @@ #include <asm/clk.h> #include <dm/test.h> #include <linux/err.h> +#include <test/test.h> #include <test/ut.h>

/* Base test of the clk uclass */ diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c index ae3a4d8a76..da2292a51a 100644 --- a/test/dm/clk_ccf.c +++ b/test/dm/clk_ccf.c @@ -11,6 +11,7 @@ #include <dm/test.h> #include <dm/uclass.h> #include <linux/err.h> +#include <test/test.h> #include <test/ut.h> #include <sandbox-clk.h>

diff --git a/test/dm/core.c b/test/dm/core.c index f74c430843..9690dcb6d7 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -15,6 +15,7 @@ #include <dm/util.h> #include <dm/test.h> #include <dm/uclass-internal.h> +#include <test/test.h> #include <test/ut.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/cpu.c b/test/dm/cpu.c index f5f1caef71..36bd14c14e 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -9,6 +9,7 @@ #include <dm/test.h> #include <dm/uclass-internal.h> #include <cpu.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_cpu(struct unit_test_state *uts) diff --git a/test/dm/dma.c b/test/dm/dma.c index b56d17731d..4113519ecf 100644 --- a/test/dm/dma.c +++ b/test/dm/dma.c @@ -10,6 +10,7 @@ #include <dm.h> #include <dm/test.h> #include <dma.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_dma_m2m(struct unit_test_state *uts) diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c index 59fcd5558f..97917a17c1 100644 --- a/test/dm/dsi_host.c +++ b/test/dm/dsi_host.c @@ -10,6 +10,7 @@ #include <asm/state.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_dsi_host_phy_init(void *priv_data) diff --git a/test/dm/eth.c b/test/dm/eth.c index ad5354b4bf..35c17ed7fb 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -12,10 +12,11 @@ #include <fdtdec.h> #include <malloc.h> #include <net.h> +#include <asm/eth.h> #include <dm/test.h> #include <dm/device-internal.h> #include <dm/uclass-internal.h> -#include <asm/eth.h> +#include <test/test.h> #include <test/ut.h>

#define DM_TEST_ETH_NUM 4 diff --git a/test/dm/firmware.c b/test/dm/firmware.c index 60fdcbb33f..2b4f49af80 100644 --- a/test/dm/firmware.c +++ b/test/dm/firmware.c @@ -8,6 +8,7 @@ #include <syscon.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Base test of firmware probe */ diff --git a/test/dm/gpio.c b/test/dm/gpio.c index bb4b20cea9..3caba9516e 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -6,10 +6,11 @@ #include <common.h> #include <fdtdec.h> #include <dm.h> +#include <asm/gpio.h> #include <dm/root.h> #include <dm/test.h> #include <dm/util.h> -#include <asm/gpio.h> +#include <test/test.h> #include <test/ut.h>

/* Test that sandbox GPIOs work correctly */ diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c index 09ec38b4f3..49c52bcd63 100644 --- a/test/dm/hwspinlock.c +++ b/test/dm/hwspinlock.c @@ -9,6 +9,7 @@ #include <asm/state.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Test that hwspinlock driver functions are called */ diff --git a/test/dm/i2c.c b/test/dm/i2c.c index cbbd4aa29a..8a35c1be2e 100644 --- a/test/dm/i2c.c +++ b/test/dm/i2c.c @@ -15,6 +15,7 @@ #include <dm/test.h> #include <dm/uclass-internal.h> #include <dm/util.h> +#include <test/test.h> #include <test/ut.h>

static const int busnum; diff --git a/test/dm/i2s.c b/test/dm/i2s.c index 49ebc3523c..7a017be064 100644 --- a/test/dm/i2s.c +++ b/test/dm/i2s.c @@ -7,9 +7,10 @@ #include <common.h> #include <dm.h> #include <i2s.h> +#include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h> -#include <asm/test.h>

/* Basic test of the i2s codec uclass */ static int dm_test_i2s(struct unit_test_state *uts) diff --git a/test/dm/led.c b/test/dm/led.c index 00de7b3997..3d5ad9363b 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -8,6 +8,7 @@ #include <led.h> #include <asm/gpio.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Base test of the led uclass */ diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c index 4562d2ac4f..195b9a9695 100644 --- a/test/dm/mailbox.c +++ b/test/dm/mailbox.c @@ -7,6 +7,7 @@ #include <dm.h> #include <dm/test.h> #include <asm/mbox.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_mailbox(struct unit_test_state *uts) diff --git a/test/dm/mdio.c b/test/dm/mdio.c index dc229aed6d..9ad21ccde4 100644 --- a/test/dm/mdio.c +++ b/test/dm/mdio.c @@ -6,10 +6,11 @@

#include <common.h> #include <dm.h> -#include <dm/test.h> +#include <miiphy.h> #include <misc.h> +#include <dm/test.h> +#include <test/test.h> #include <test/ut.h> -#include <miiphy.h>

/* macros copied over from mdio_sandbox.c */ #define SANDBOX_PHY_ADDR 5 diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c index f962e09dbc..0b3f85a53b 100644 --- a/test/dm/mdio_mux.c +++ b/test/dm/mdio_mux.c @@ -6,10 +6,11 @@

#include <common.h> #include <dm.h> -#include <dm/test.h> +#include <miiphy.h> #include <misc.h> +#include <dm/test.h> +#include <test/test.h> #include <test/ut.h> -#include <miiphy.h>

/* macros copied over from mdio_sandbox.c */ #define SANDBOX_PHY_ADDR 5 diff --git a/test/dm/misc.c b/test/dm/misc.c index 4d4232adf1..15f475abb3 100644 --- a/test/dm/misc.c +++ b/test/dm/misc.c @@ -8,6 +8,7 @@ #include <dm.h> #include <dm/test.h> #include <misc.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_misc(struct unit_test_state *uts) diff --git a/test/dm/mmc.c b/test/dm/mmc.c index 9ab0db1b66..204137b5ac 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -7,6 +7,7 @@ #include <dm.h> #include <mmc.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* diff --git a/test/dm/nop.c b/test/dm/nop.c index 2df29f3d15..8b3b646892 100644 --- a/test/dm/nop.c +++ b/test/dm/nop.c @@ -13,6 +13,7 @@ #include <dm/device.h> #include <dm/test.h> #include <misc.h> +#include <test/test.h> #include <test/ut.h>

static int noptest_bind(struct udevice *parent) diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 745de50c7b..9127cb1bbe 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -4,6 +4,7 @@ #include <dm.h> #include <dm/of_extra.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_ofnode_compatible(struct unit_test_state *uts) diff --git a/test/dm/osd.c b/test/dm/osd.c index 6910690b3a..c63dfbcdb1 100644 --- a/test/dm/osd.c +++ b/test/dm/osd.c @@ -7,10 +7,11 @@ #include <common.h> #include <display_options.h> #include <dm.h> -#include <dm/test.h> -#include <test/ut.h> #include <video_osd.h> #include <asm/test.h> +#include <dm/test.h> +#include <test/test.h> +#include <test/ut.h>

#include "../../drivers/video/sandbox_osd.h"

diff --git a/test/dm/panel.c b/test/dm/panel.c index 7e4ebd6d81..410e8f3907 100644 --- a/test/dm/panel.c +++ b/test/dm/panel.c @@ -14,8 +14,9 @@ #include <asm/gpio.h> #include <asm/test.h> #include <dm/test.h> -#include <test/ut.h> #include <power/regulator.h> +#include <test/test.h> +#include <test/ut.h>

/* Basic test of the panel uclass */ static int dm_test_panel(struct unit_test_state *uts) diff --git a/test/dm/pch.c b/test/dm/pch.c index 54e33d187b..bf17a31ccf 100644 --- a/test/dm/pch.c +++ b/test/dm/pch.c @@ -8,6 +8,7 @@ #include <pch.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Test that sandbox PCH works correctly */ diff --git a/test/dm/pci.c b/test/dm/pci.c index fb93e4c78a..43b045d429 100644 --- a/test/dm/pci.c +++ b/test/dm/pci.c @@ -8,6 +8,7 @@ #include <asm/io.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Test that sandbox PCI works correctly */ diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c index 101f861751..a29d00eebe 100644 --- a/test/dm/pci_ep.c +++ b/test/dm/pci_ep.c @@ -5,12 +5,13 @@

#include <common.h> #include <dm.h> +#include <hexdump.h> +#include <pci_ep.h> #include <asm/io.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h> -#include <hexdump.h> -#include <pci_ep.h>

/* Test that sandbox PCI EP works correctly */ static int dm_test_pci_ep_base(struct unit_test_state *uts) diff --git a/test/dm/phy.c b/test/dm/phy.c index 21d92194b9..c5761cf3e7 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -8,6 +8,7 @@ #include <dm.h> #include <generic-phy.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Base test of the phy uclass */ diff --git a/test/dm/pmic.c b/test/dm/pmic.c index b582329a9c..8c2766aeac 100644 --- a/test/dm/pmic.c +++ b/test/dm/pmic.c @@ -10,16 +10,17 @@ #include <errno.h> #include <dm.h> #include <fdtdec.h> +#include <fsl_pmic.h> #include <malloc.h> #include <dm/device-internal.h> #include <dm/root.h> -#include <dm/util.h> #include <dm/test.h> #include <dm/uclass-internal.h> +#include <dm/util.h> #include <power/pmic.h> #include <power/sandbox_pmic.h> +#include <test/test.h> #include <test/ut.h> -#include <fsl_pmic.h>

/* Test PMIC get method */

diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c index 48318218a9..84b4c90f69 100644 --- a/test/dm/power-domain.c +++ b/test/dm/power-domain.c @@ -7,6 +7,7 @@ #include <dm.h> #include <dm/test.h> #include <asm/power-domain.h> +#include <test/test.h> #include <test/ut.h>

/* This must match the specifier for power-domains in the DT node */ diff --git a/test/dm/pwm.c b/test/dm/pwm.c index b52ee21a69..8cc911e1ad 100644 --- a/test/dm/pwm.c +++ b/test/dm/pwm.c @@ -7,6 +7,7 @@ #include <dm.h> #include <pwm.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Basic test of the pwm uclass */ diff --git a/test/dm/ram.c b/test/dm/ram.c index 3efdb6b80b..2456466b56 100644 --- a/test/dm/ram.c +++ b/test/dm/ram.c @@ -7,6 +7,7 @@ #include <dm.h> #include <ram.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 82de295cb8..64699dd792 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -10,6 +10,7 @@ #include <syscon.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Base test of register maps */ diff --git a/test/dm/regulator.c b/test/dm/regulator.c index e510539542..91eebc6909 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -19,6 +19,7 @@ #include <power/pmic.h> #include <power/regulator.h> #include <power/sandbox_pmic.h> +#include <test/test.h> #include <test/ut.h>

enum { diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c index 1d9a9b32d5..1ebb7c2466 100644 --- a/test/dm/remoteproc.c +++ b/test/dm/remoteproc.c @@ -10,7 +10,9 @@ #include <remoteproc.h> #include <asm/io.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h> + /** * dm_test_remoteproc_base() - test the operations after initializations * @uts: unit test state diff --git a/test/dm/reset.c b/test/dm/reset.c index c61daed490..ab0a38a18e 100644 --- a/test/dm/reset.c +++ b/test/dm/reset.c @@ -8,6 +8,7 @@ #include <reset.h> #include <dm/test.h> #include <asm/reset.h> +#include <test/test.h> #include <test/ut.h>

/* This must match the specifier for mbox-names="test" in the DT node */ diff --git a/test/dm/rtc.c b/test/dm/rtc.c index 7188742764..2653dd0fd2 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -11,6 +11,7 @@ #include <asm/io.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Simple RTC sanity check */ diff --git a/test/dm/serial.c b/test/dm/serial.c index 3d741a8c36..175e19dbc6 100644 --- a/test/dm/serial.c +++ b/test/dm/serial.c @@ -7,6 +7,7 @@ #include <serial.h> #include <dm.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

static int dm_test_serial(struct unit_test_state *uts) diff --git a/test/dm/sf.c b/test/dm/sf.c index 3788d59052..e70bc78e91 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -14,6 +14,7 @@ #include <asm/test.h> #include <dm/test.h> #include <dm/util.h> +#include <test/test.h> #include <test/ut.h>

/* Simple test of sandbox SPI flash */ diff --git a/test/dm/smem.c b/test/dm/smem.c index 4099a5f66c..21dd96e409 100644 --- a/test/dm/smem.c +++ b/test/dm/smem.c @@ -7,6 +7,7 @@ #include <dm.h> #include <smem.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Basic test of the smem uclass */ diff --git a/test/dm/sound.c b/test/dm/sound.c index 3767abbd1c..bb2b7285e2 100644 --- a/test/dm/sound.c +++ b/test/dm/sound.c @@ -9,6 +9,7 @@ #include <sound.h> #include <dm/test.h> #include <test/ut.h> +#include <test/test.h> #include <asm/test.h>

/* Basic test of the sound codec uclass */ diff --git a/test/dm/spi.c b/test/dm/spi.c index ffd789cd7f..978997786a 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -13,6 +13,7 @@ #include <dm/test.h> #include <dm/uclass-internal.h> #include <dm/util.h> +#include <test/test.h> #include <test/ut.h>

/* Test that we can find buses and chip-selects */ diff --git a/test/dm/spmi.c b/test/dm/spmi.c index e6a910859e..aa8d6961fd 100644 --- a/test/dm/spmi.c +++ b/test/dm/spmi.c @@ -13,6 +13,7 @@ #include <power/pmic.h> #include <spmi/spmi.h> #include <asm/gpio.h> +#include <test/test.h> #include <test/ut.h>

/* Test if bus childs got probed propperly*/ diff --git a/test/dm/syscon.c b/test/dm/syscon.c index 0ff9da7ec6..533e328449 100644 --- a/test/dm/syscon.c +++ b/test/dm/syscon.c @@ -9,6 +9,7 @@ #include <regmap.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Base test of system controllers */ diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index 5b2358ef67..e5cd18cd82 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -9,6 +9,7 @@ #include <asm/state.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Test that we can use particular sysreset devices */ diff --git a/test/dm/tee.c b/test/dm/tee.c index 22f05a4219..c59a515b8b 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -8,6 +8,7 @@ #include <dm/test.h> #include <sandboxtee.h> #include <tee.h> +#include <test/test.h> #include <test/ut.h> #include <tee/optee_ta_avb.h>

diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index abb5b7115a..3261a823f5 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -10,9 +10,10 @@ #include <dm.h> #include <errno.h> #include <malloc.h> +#include <asm/io.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h> -#include <asm/io.h>

int dm_testdrv_op_count[DM_TEST_OP_COUNT]; static struct unit_test_state *uts = &global_dm_test_state; diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 1fb8b5c248..b24d5056c3 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -16,6 +16,7 @@ #include <dm/util.h> #include <dm/lists.h> #include <dm/of_access.h> +#include <test/test.h> #include <test/ut.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 72648162a9..1441f029e7 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -13,6 +13,8 @@ #include <dm/test.h> #include <dm/root.h> #include <dm/uclass-internal.h> +#include <test/test.h> +#include <test/test.h> #include <test/ut.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 25271c6ba0..eabaca72e4 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -13,6 +13,7 @@ #include <asm/io.h> #include <dm/test.h> #include <linux/list.h> +#include <test/test.h> #include <test/ut.h>

static struct unit_test_state *uts = &global_dm_test_state; diff --git a/test/dm/timer.c b/test/dm/timer.c index 9367dab5d5..4aa5eeac75 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -7,6 +7,7 @@ #include <dm.h> #include <timer.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* diff --git a/test/dm/usb.c b/test/dm/usb.c index ef454b0ae5..47cb9b9b49 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -13,6 +13,7 @@ #include <dm/device-internal.h> #include <dm/test.h> #include <dm/uclass-internal.h> +#include <test/test.h> #include <test/ut.h>

/* Test that sandbox USB works correctly */ diff --git a/test/dm/video.c b/test/dm/video.c index 3151ebb73f..5d93aefd34 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -13,6 +13,7 @@ #include <video_console.h> #include <dm/test.h> #include <dm/uclass-internal.h> +#include <test/test.h> #include <test/ut.h>

/* diff --git a/test/dm/virtio.c b/test/dm/virtio.c index 4b317d2ec3..a2ed36a2fe 100644 --- a/test/dm/virtio.c +++ b/test/dm/virtio.c @@ -9,9 +9,10 @@ #include <virtio.h> #include <virtio_ring.h> #include <dm/device-internal.h> -#include <dm/uclass-internal.h> #include <dm/root.h> #include <dm/test.h> +#include <dm/uclass-internal.h> +#include <test/test.h> #include <test/ut.h>

/* Basic test of the virtio uclass */ diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 1d31ec55c6..c704098b24 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -9,6 +9,7 @@ #include <asm/state.h> #include <asm/test.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

/* Test that watchdog driver functions are called */ diff --git a/test/lib/lmb.c b/test/lib/lmb.c index ec68227bb6..1f50a51cd6 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -4,8 +4,10 @@ */

#include <common.h> +#include <dm.h> #include <lmb.h> #include <dm/test.h> +#include <test/test.h> #include <test/ut.h>

static int check_lmb(struct unit_test_state *uts, struct lmb *lmb,