@@ -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
*
@@ -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)
@@ -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>
@@ -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)
@@ -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;
@@ -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"
@@ -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)
@@ -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;
@@ -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 */
@@ -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>
@@ -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;
@@ -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)
@@ -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)
@@ -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)
@@ -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
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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;
@@ -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)
@@ -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 */
@@ -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)
@@ -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
@@ -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
@@ -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)
@@ -7,6 +7,7 @@
#include <dm.h>
#include <mmc.h>
#include <dm/test.h>
+#include <test/test.h>
#include <test/ut.h>
/*
@@ -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)
@@ -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)
@@ -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"
@@ -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)
@@ -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 */
@@ -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 */
@@ -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)
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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;
@@ -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 */
@@ -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 {
@@ -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
@@ -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 */
@@ -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 */
@@ -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)
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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*/
@@ -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 */
@@ -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 */
@@ -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>
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -7,6 +7,7 @@
#include <dm.h>
#include <timer.h>
#include <dm/test.h>
+#include <test/test.h>
#include <test/ut.h>
/*
@@ -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 */
@@ -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>
/*
@@ -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 */
@@ -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 */
@@ -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,
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(-)