diff options
| author | Tom Rini <[email protected]> | 2023-10-10 08:54:17 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-10 08:54:17 -0400 |
| commit | 833ff23047c50e4053fb1bda21f4e2c9f6a3aa6a (patch) | |
| tree | 422a1ac1688b75a6c4edcbaa2024346acbaddfb8 /include | |
| parent | d9bb6d779b69c2548891e568e5e2a23e1b7eedaa (diff) | |
| parent | 3f876cb7c57511174d1b6a3e089443ccbaf236ec (diff) | |
Merge branch '2023-10-09-assorted-fixes'
- Cleanup how we pick what to launch in SPL, a few test changes, some TI
K3 platform updates, top-level Makefile fixes and related cleanup,
correct a problem with LMB overlap, other assorted fixes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/spl.h | 2 | ||||
| -rw-r--r-- | include/stdio_dev.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/spl.h b/include/spl.h index f713363f8cd..7d30fb57dac 100644 --- a/include/spl.h +++ b/include/spl.h @@ -793,7 +793,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, /** * spl_invoke_atf - boot using an ARM trusted firmware image */ -void spl_invoke_atf(struct spl_image_info *spl_image); +void __noreturn spl_invoke_atf(struct spl_image_info *spl_image); /** * bl2_plat_get_bl31_params() - return params for bl31. diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 7f181020524..4e3c4708f80 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -17,6 +17,7 @@ #define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */ #define DEV_FLAGS_OUTPUT 0x00000002 /* Device can be used as output console */ #define DEV_FLAGS_DM 0x00000004 /* Device priv is a struct udevice * */ +#define STDIO_NAME_LEN 32 int stdio_file_to_flags(const int file); @@ -24,7 +25,7 @@ int stdio_file_to_flags(const int file); struct stdio_dev { int flags; /* Device flags: input/output/system */ int ext; /* Supported extensions */ - char name[32]; /* Device name */ + char name[STDIO_NAME_LEN]; /* Device name */ /* GENERAL functions */ |