diff options
Diffstat (limited to 'test')
47 files changed, 72 insertions, 20 deletions
diff --git a/test/bloblist.c b/test/bloblist.c index bdcca0291c7..4e537ee1b9c 100644 --- a/test/bloblist.c +++ b/test/bloblist.c @@ -234,7 +234,8 @@ static int bloblist_test_checksum(struct unit_test_state *uts) BLOBLIST_TEST(bloblist_test_checksum, 0); -int do_ut_bloblist(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, bloblist_test); diff --git a/test/cmd_ut.c b/test/cmd_ut.c index bd20a69c552..cc9543c315c 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -9,11 +9,12 @@ #include <test/suites.h> #include <test/test.h> -static int do_ut_all(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +static int do_ut_all(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]); int cmd_ut_category(const char *name, const char *prefix, struct unit_test *tests, int n_ents, - int argc, char * const argv[]) + int argc, char *const argv[]) { struct unit_test_state uts = { .fail_count = 0 }; struct unit_test *test; @@ -43,7 +44,7 @@ int cmd_ut_category(const char *name, const char *prefix, return uts.fail_count ? CMD_RET_FAILURE : 0; } -static cmd_tbl_t cmd_ut_sub[] = { +static struct cmd_tbl cmd_ut_sub[] = { U_BOOT_CMD_MKENT(all, CONFIG_SYS_MAXARGS, 1, do_ut_all, "", ""), #if defined(CONFIG_UT_DM) U_BOOT_CMD_MKENT(dm, CONFIG_SYS_MAXARGS, 1, do_ut_dm, "", ""), @@ -79,7 +80,8 @@ static cmd_tbl_t cmd_ut_sub[] = { #endif }; -static int do_ut_all(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_ut_all(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { int i; int retval; @@ -95,9 +97,9 @@ static int do_ut_all(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return any_fail; } -static int do_ut(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_ut(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - cmd_tbl_t *cp; + struct cmd_tbl *cp; if (argc < 2) return CMD_RET_USAGE; diff --git a/test/command_ut.c b/test/command_ut.c index 8e268e5ee52..9837d10eb5c 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -7,12 +7,15 @@ #include <common.h> #include <command.h> +#include <env.h> +#include <log.h> static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; " "setenv list ${list}3\0" "setenv list ${list}4"; -static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_ut_cmd(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { printf("%s: Testing commands\n", __func__); run_command("env default -f -a", 0); diff --git a/test/compression.c b/test/compression.c index 63f929fa4bd..ad719ddb4d6 100644 --- a/test/compression.c +++ b/test/compression.c @@ -7,6 +7,8 @@ #include <bootm.h> #include <command.h> #include <gzip.h> +#include <image.h> +#include <log.h> #include <lz4.h> #include <malloc.h> #include <mapmem.h> @@ -534,7 +536,8 @@ static int compression_test_bootm_none(struct unit_test_state *uts) } COMPRESSION_TEST(compression_test_bootm_none, 0); -int do_ut_compression(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, compression_test); diff --git a/test/dm/axi.c b/test/dm/axi.c index e234ab82e65..289f07a08a8 100644 --- a/test/dm/axi.c +++ b/test/dm/axi.c @@ -7,6 +7,7 @@ #include <common.h> #include <axi.h> #include <dm.h> +#include <log.h> #include <dm/test.h> #include <test/ut.h> #include <asm/axi.h> diff --git a/test/dm/blk.c b/test/dm/blk.c index 9c71adc69d9..94b2855b8e9 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <part.h> #include <usb.h> #include <asm/state.h> #include <dm/test.h> diff --git a/test/dm/board.c b/test/dm/board.c index 0f267a19260..5472c65fad6 100644 --- a/test/dm/board.c +++ b/test/dm/board.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <dm/test.h> #include <board.h> #include <test/ut.h> diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c index 0817b7d3ec1..be0c2789070 100644 --- a/test/dm/bootcount.c +++ b/test/dm/bootcount.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <bootcount.h> +#include <log.h> #include <asm/test.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/bus.c b/test/dm/bus.c index 1ad45adb605..73eb3aede3d 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -5,6 +5,7 @@ #include <common.h> #ifdef CONFIG_SANDBOX +#include <log.h> #include <os.h> #endif #include <dm.h> diff --git a/test/dm/clk.c b/test/dm/clk.c index 003b78934f3..48fc3dd714c 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -6,6 +6,7 @@ #include <common.h> #include <clk.h> #include <dm.h> +#include <log.h> #include <malloc.h> #include <asm/clk.h> #include <dm/test.h> diff --git a/test/dm/core.c b/test/dm/core.c index f74c4308439..6a930ae31ad 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -9,6 +9,7 @@ #include <errno.h> #include <dm.h> #include <fdtdec.h> +#include <log.h> #include <malloc.h> #include <dm/device-internal.h> #include <dm/root.h> diff --git a/test/dm/cpu.c b/test/dm/cpu.c index def9b64a282..46683d884a4 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <dm/test.h> #include <dm/uclass-internal.h> #include <cpu.h> diff --git a/test/dm/devres.c b/test/dm/devres.c index cbd0972c9b4..b5de0cb191a 100644 --- a/test/dm/devres.c +++ b/test/dm/devres.c @@ -8,6 +8,7 @@ #include <common.h> #include <errno.h> #include <dm.h> +#include <log.h> #include <malloc.h> #include <dm/device-internal.h> #include <dm/devres.h> diff --git a/test/dm/eth.c b/test/dm/eth.c index ad5354b4bfb..99c1672b996 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -10,6 +10,7 @@ #include <dm.h> #include <env.h> #include <fdtdec.h> +#include <log.h> #include <malloc.h> #include <net.h> #include <dm/test.h> diff --git a/test/dm/gpio.c b/test/dm/gpio.c index 7c18e5c4119..b5ee4e4f871 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -6,6 +6,7 @@ #include <common.h> #include <fdtdec.h> #include <dm.h> +#include <log.h> #include <malloc.h> #include <dm/root.h> #include <dm/test.h> diff --git a/test/dm/mdio.c b/test/dm/mdio.c index dc229aed6d0..ba1b54f27e2 100644 --- a/test/dm/mdio.c +++ b/test/dm/mdio.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <dm/test.h> #include <misc.h> #include <test/ut.h> diff --git a/test/dm/mmc.c b/test/dm/mmc.c index 9ab0db1b66f..49402b9c902 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <mmc.h> +#include <part.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 07d5c7d7a65..1114f34cbf8 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -2,6 +2,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <dm/of_extra.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/phy.c b/test/dm/phy.c index 92455d94aff..99f01195578 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -7,6 +7,7 @@ #include <common.h> #include <dm.h> #include <generic-phy.h> +#include <log.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/regmap.c b/test/dm/regmap.c index b21f66732b9..809494d585e 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <mapmem.h> #include <regmap.h> #include <syscon.h> diff --git a/test/dm/regulator.c b/test/dm/regulator.c index b967902493d..ca916eeebb6 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -10,6 +10,7 @@ #include <errno.h> #include <dm.h> #include <fdtdec.h> +#include <log.h> #include <malloc.h> #include <dm/device-internal.h> #include <dm/root.h> diff --git a/test/dm/reset.c b/test/dm/reset.c index 8370820428c..871d6400a07 100644 --- a/test/dm/reset.c +++ b/test/dm/reset.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <malloc.h> #include <reset.h> #include <dm/test.h> diff --git a/test/dm/rng.c b/test/dm/rng.c index ce20e2d7c2c..583ce9eddf0 100644 --- a/test/dm/rng.c +++ b/test/dm/rng.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <rng.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/rtc.c b/test/dm/rtc.c index 71887427647..88f86581cce 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -7,6 +7,7 @@ #include <common.h> #include <dm.h> #include <i2c.h> +#include <log.h> #include <rtc.h> #include <asm/io.h> #include <asm/test.h> diff --git a/test/dm/serial.c b/test/dm/serial.c index c6be6ab7abd..6237693cb80 100644 --- a/test/dm/serial.c +++ b/test/dm/serial.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <log.h> #include <serial.h> #include <dm.h> #include <dm/test.h> diff --git a/test/dm/syscon.c b/test/dm/syscon.c index f1021f374b6..06a1c69ac5c 100644 --- a/test/dm/syscon.c +++ b/test/dm/syscon.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <syscon.h> #include <regmap.h> #include <asm/test.h> diff --git a/test/dm/tee.c b/test/dm/tee.c index d40f13d2915..632e9960b0b 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <malloc.h> #include <dm/test.h> #include <sandboxtee.h> diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index abb5b7115a3..ba85fa313e8 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -9,6 +9,7 @@ #include <common.h> #include <dm.h> #include <errno.h> +#include <log.h> #include <malloc.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 1128c420a30..4fcae03dc5b 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -7,6 +7,7 @@ #include <dm.h> #include <errno.h> #include <fdtdec.h> +#include <log.h> #include <malloc.h> #include <asm/io.h> #include <dm/test.h> diff --git a/test/dm/test-main.c b/test/dm/test-main.c index d7dc8d1f915..53e5ca321fe 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -8,6 +8,7 @@ #include <console.h> #include <dm.h> #include <errno.h> +#include <log.h> #include <malloc.h> #include <asm/state.h> #include <dm/test.h> @@ -200,7 +201,7 @@ static int dm_test_main(const char *test_name) return uts->fail_count ? CMD_RET_FAILURE : 0; } -int do_ut_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { const char *test_name = NULL; diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 25271c6ba04..b6d629a285c 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <log.h> #include <malloc.h> #include <dm.h> #include <errno.h> diff --git a/test/dm/usb.c b/test/dm/usb.c index e396c2a0ea1..a25c2c14820 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -6,6 +6,7 @@ #include <common.h> #include <console.h> #include <dm.h> +#include <part.h> #include <usb.h> #include <asm/io.h> #include <asm/state.h> diff --git a/test/dm/video.c b/test/dm/video.c index f72979fac4e..0664e3f22b3 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -7,6 +7,7 @@ #include <common.h> #include <bzlib.h> #include <dm.h> +#include <log.h> #include <malloc.h> #include <mapmem.h> #include <os.h> diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c index ad67dbe7929..a440b1bfb0e 100644 --- a/test/env/cmd_ut_env.c +++ b/test/env/cmd_ut_env.c @@ -10,7 +10,7 @@ #include <test/suites.h> #include <test/ut.h> -int do_ut_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, env_test); const int n_ents = ll_entry_count(struct unit_test, env_test); diff --git a/test/env/hashtable.c b/test/env/hashtable.c index 5242c4cc3ed..339cc19ba14 100644 --- a/test/env/hashtable.c +++ b/test/env/hashtable.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <log.h> #include <search.h> #include <stdio.h> #include <test/env.h> diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c index c73e8d7b05a..f5c7bf3d3b0 100644 --- a/test/lib/cmd_ut_lib.c +++ b/test/lib/cmd_ut_lib.c @@ -11,7 +11,7 @@ #include <test/suites.h> #include <test/ut.h> -int do_ut_lib(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, lib_test); const int n_ents = ll_entry_count(struct unit_test, lib_test); diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 1336b54b11f..a0fe0f6b339 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -5,6 +5,7 @@ #include <common.h> #include <lmb.h> +#include <log.h> #include <malloc.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/lib/string.c b/test/lib/string.c index 8e246ab4ed9..64234bef36c 100644 --- a/test/lib/string.c +++ b/test/lib/string.c @@ -11,6 +11,7 @@ #include <common.h> #include <command.h> +#include <log.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 fb8a0b17ba4..cbc712f7eda 100644 --- a/test/lib/test_aes.c +++ b/test/lib/test_aes.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> #include <hexdump.h> +#include <rand.h> #include <uboot_aes.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/log/log_test.c b/test/log/log_test.c index febc2c1252a..4245372d65f 100644 --- a/test/log/log_test.c +++ b/test/log/log_test.c @@ -7,6 +7,8 @@ */ #include <common.h> +#include <command.h> +#include <log.h> /* emit some sample log records in different ways, for testing */ static int log_run(enum uclass_id cat, const char *file) @@ -200,7 +202,7 @@ static int log_test(int testnum) } #ifdef CONFIG_LOG_TEST -int do_log_test(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +int do_log_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int testnum = 0; int ret; diff --git a/test/log/test-main.c b/test/log/test-main.c index 855de47f337..c534add493e 100644 --- a/test/log/test-main.c +++ b/test/log/test-main.c @@ -7,10 +7,11 @@ #include <common.h> #include <console.h> +#include <log.h> #include <test/log.h> #include <test/suites.h> -int do_ut_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, log_test); const int n_ents = ll_entry_count(struct unit_test, log_test); diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c index 092710326a8..9fa4c91e0dd 100644 --- a/test/optee/cmd_ut_optee.c +++ b/test/optee/cmd_ut_optee.c @@ -7,6 +7,7 @@ #include <command.h> #include <errno.h> #include <fdt_support.h> +#include <log.h> #include <malloc.h> #include <tee/optee.h> @@ -91,7 +92,7 @@ static int optee_fdt_protected_memory(struct unit_test_state *uts) } OPTEE_TEST(optee_fdt_protected_memory, 0); -int do_ut_optee(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, optee_test); diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c index d0083fd6bee..c001fb183fe 100644 --- a/test/overlay/cmd_ut_overlay.c +++ b/test/overlay/cmd_ut_overlay.c @@ -8,6 +8,8 @@ #include <command.h> #include <errno.h> #include <fdt_support.h> +#include <image.h> +#include <log.h> #include <malloc.h> #include <linux/sizes.h> @@ -209,7 +211,7 @@ static int fdt_overlay_stacked(struct unit_test_state *uts) } OVERLAY_TEST(fdt_overlay_stacked, 0); -int do_ut_overlay(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, overlay_test); diff --git a/test/print_ut.c b/test/print_ut.c index a3b9974ad26..a456a449efa 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -7,9 +7,11 @@ #include <common.h> #if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD) +#include <command.h> #include <efi_api.h> #endif #include <display_options.h> +#include <log.h> #include <version.h> #define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \ @@ -68,7 +70,7 @@ static void efi_ut_print(void) #endif } -static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_ut_print(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { char big_str[400]; diff --git a/test/str_ut.c b/test/str_ut.c index 7c8015050ad..ef1205dbbd0 100644 --- a/test/str_ut.c +++ b/test/str_ut.c @@ -105,7 +105,7 @@ static int str_simple_strtoul(struct unit_test_state *uts) } STR_TEST(str_simple_strtoul, 0); -int do_ut_str(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +int do_ut_str(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, str_test); diff --git a/test/time_ut.c b/test/time_ut.c index 40a19a50d93..80b82dbfd83 100644 --- a/test/time_ut.c +++ b/test/time_ut.c @@ -8,6 +8,7 @@ #include <command.h> #include <errno.h> #include <time.h> +#include <linux/delay.h> static int test_get_timer(void) { @@ -117,7 +118,7 @@ static int test_udelay(void) return 0; } -int do_ut_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_time(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int ret = 0; diff --git a/test/unicode_ut.c b/test/unicode_ut.c index d8b4aa9b443..5f932bffd3a 100644 --- a/test/unicode_ut.c +++ b/test/unicode_ut.c @@ -9,6 +9,7 @@ #include <charset.h> #include <command.h> #include <errno.h> +#include <log.h> #include <malloc.h> #include <test/test.h> #include <test/suites.h> @@ -591,7 +592,7 @@ static int unicode_test_u16_strsize(struct unit_test_state *uts) } UNICODE_TEST(unicode_test_u16_strsize); -int do_ut_unicode(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_ut_unicode(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = ll_entry_start(struct unit_test, unicode_test); const int n_ents = ll_entry_count(struct unit_test, unicode_test); |