diff options
| author | Tom Rini <[email protected]> | 2022-07-27 06:59:55 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-07-27 06:59:55 -0400 |
| commit | 7277c4bddceb6b8a59ba47b8b111ab070d86919f (patch) | |
| tree | 0bd1db6551763d178d25e80a350be458150c9e8e /include | |
| parent | 81e712a91729950fbd8fb38a6f729cb9847b0adb (diff) | |
| parent | dce4322c0e1940e11ef9ff086890b8c474707317 (diff) | |
Merge tag 'dm-pull-26jul22' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm.git
minor dm- and fdt-related fixes
start of test for fdt command
Diffstat (limited to 'include')
| -rw-r--r-- | include/addr_map.h | 2 | ||||
| -rw-r--r-- | include/command.h | 10 | ||||
| -rw-r--r-- | include/log.h | 3 | ||||
| -rw-r--r-- | include/test/suites.h | 1 |
4 files changed, 16 insertions, 0 deletions
diff --git a/include/addr_map.h b/include/addr_map.h index 55d3a6a165a..db3712b5d30 100644 --- a/include/addr_map.h +++ b/include/addr_map.h @@ -14,7 +14,9 @@ struct addrmap { unsigned long vaddr; }; +#ifdef CONFIG_ADDR_MAP extern struct addrmap address_map[CONFIG_SYS_NUM_ADDR_MAP]; +#endif phys_addr_t addrmap_virt_to_phys(void *vaddr); void *addrmap_phys_to_virt(phys_addr_t paddr); diff --git a/include/command.h b/include/command.h index 0cf12fde396..44c91f655d4 100644 --- a/include/command.h +++ b/include/command.h @@ -258,6 +258,16 @@ int run_command(const char *cmd, int flag); int run_command_repeatable(const char *cmd, int flag); /** + * run_commandf() - Run a command created by a format string + * + * The command cannot be larger than 127 characters + * + * @fmt: printf() format string + * @...: Arguments to use (flag is always 0) + */ +int run_commandf(const char *fmt, ...); + +/** * Run a list of commands separated by ; or even \0 * * Note that if 'len' is not -1, then the command does not need to be nul diff --git a/include/log.h b/include/log.h index 8f35c10abb5..7abc70e4398 100644 --- a/include/log.h +++ b/include/log.h @@ -194,6 +194,9 @@ int _log_buffer(enum log_category_t cat, enum log_level_t level, #ifdef LOG_DEBUG #define _LOG_DEBUG LOGL_FORCE_DEBUG +#ifndef DEBUG +#define DEBUG +#endif #else #define _LOG_DEBUG 0 #endif diff --git a/include/test/suites.h b/include/test/suites.h index ddb8827fdb1..44025ccecd6 100644 --- a/include/test/suites.h +++ b/include/test/suites.h @@ -38,6 +38,7 @@ int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_lib(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_ut_log(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]); |