diff options
| author | Tom Rini <[email protected]> | 2022-08-10 17:49:20 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-08-10 17:49:20 -0400 |
| commit | cdebee1fd9fa04cc4c972f826bae19b28c253eb0 (patch) | |
| tree | 97a13d6a54ea8cb825d19cd65d4c9480ffd327dc /include | |
| parent | 3dd4e916324efc825a7ee8e412f5cf1ded839021 (diff) | |
| parent | 468091a4602f78aaa11d41190ae66d8b240e144a (diff) | |
Merge branch '2022-08-10-assorted-updates'
- An assortment of bugfixes and minor updates
Diffstat (limited to 'include')
| -rw-r--r-- | include/command.h | 6 | ||||
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/display_options.h | 1 | ||||
| -rw-r--r-- | include/lmb.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/command.h b/include/command.h index 44c91f655d4..8917da8b21c 100644 --- a/include/command.h +++ b/include/command.h @@ -229,10 +229,10 @@ enum command_ret_t { * is left unchanged. * @param ticks If ticks is not null, this function set it to the * number of ticks the command took to complete. - * Return: 0 if the command succeeded, 1 if it failed + * Return: 0 if command succeeded, else non-zero (CMD_RET_...) */ -int cmd_process(int flag, int argc, char *const argv[], int *repeatable, - unsigned long *ticks); +enum command_ret_t cmd_process(int flag, int argc, char *const argv[], + int *repeatable, unsigned long *ticks); void fixup_cmdtable(struct cmd_tbl *cmdtp, int size); diff --git a/include/common.h b/include/common.h index 71df59bca0e..25c317f4439 100644 --- a/include/common.h +++ b/include/common.h @@ -23,7 +23,6 @@ #include <stdio.h> #include <linux/kernel.h> #include <asm/u-boot.h> /* boot information for Linux kernel */ -#include <display_options.h> #include <vsprintf.h> #endif /* __ASSEMBLY__ */ diff --git a/include/display_options.h b/include/display_options.h index 33fcbb85335..85dacbc7590 100644 --- a/include/display_options.h +++ b/include/display_options.h @@ -19,6 +19,7 @@ * @size: Size to print * @suffix String to print after the size */ +#include <display_options.h> void print_size(uint64_t size, const char *suffix); /** diff --git a/include/lmb.h b/include/lmb.h index 1476d78c282..7298c2ccc40 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -68,7 +68,7 @@ struct lmb_region { struct lmb { struct lmb_region memory; struct lmb_region reserved; -#if IS_ENABLED(CONFIG_LMB_MEMORY_REGIONS) +#ifdef CONFIG_LMB_MEMORY_REGIONS struct lmb_property memory_regions[CONFIG_LMB_MEMORY_REGIONS]; struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS]; #endif |