diff options
| author | Tom Rini <[email protected]> | 2021-10-31 15:48:43 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-31 15:48:43 -0400 |
| commit | 360e392274e3bfeda3b7226d2cac7514774d0da1 (patch) | |
| tree | 2f3608441e5fbbd43a9f5e3e51926ed352a2e838 /include | |
| parent | 77680d8f85b94ffe690b8fe1f35767aef8b1415a (diff) | |
| parent | b55881ddb455af31b64038cf3b67f781909971cc (diff) | |
Merge tag 'dm-pull-boo21' of https://source.denx.de/u-boot/custodians/u-boot-dm
Environment tidy-ups
patman 'postfix' support
fix binman test race condition causing a timeout error
# gpg: Signature made Sun 31 Oct 2021 03:36:55 PM EDT
# gpg: using RSA key B25C0022AF86A7CC1655B6277F173A3E9008ADE6
# gpg: issuer "[email protected]"
# gpg: Good signature from "Simon Glass <[email protected]>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B25C 0022 AF86 A7CC 1655 B627 7F17 3A3E 9008 ADE6
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootstage.h | 2 | ||||
| -rw-r--r-- | include/env_default.h | 10 | ||||
| -rw-r--r-- | include/env_internal.h | 4 | ||||
| -rw-r--r-- | include/image.h | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/include/bootstage.h b/include/bootstage.h index f837a387c8c..8d1989ac0e5 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -220,7 +220,7 @@ enum bootstage_id { */ ulong timer_get_boot_us(void); -#if defined(USE_HOSTCC) || !CONFIG_IS_ENABLED(BOOTSTAGE) +#if defined(USE_HOSTCC) || !CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) #define show_boot_progress(val) do {} while (0) #else /** diff --git a/include/env_default.h b/include/env_default.h index 66e203eb6e4..23430dc70d7 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -20,9 +20,9 @@ env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { #elif defined(DEFAULT_ENV_INSTANCE_STATIC) static char default_environment[] = { #elif defined(DEFAULT_ENV_IS_RW) -uchar default_environment[] = { +char default_environment[] = { #else -const uchar default_environment[] = { +const char default_environment[] = { #endif #ifndef CONFIG_USE_DEFAULT_ENV_FILE #ifdef CONFIG_ENV_CALLBACK_LIST_DEFAULT @@ -121,3 +121,9 @@ const uchar default_environment[] = { } #endif }; + +#if !defined(USE_HOSTCC) && !defined(DEFAULT_ENV_INSTANCE_EMBEDDED) +#include <env_internal.h> +static_assert(sizeof(default_environment) <= ENV_SIZE, + "Default environment is too large"); +#endif diff --git a/include/env_internal.h b/include/env_internal.h index b7bddcb00d8..f74927cd641 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -112,9 +112,9 @@ extern env_t embedded_environment; #endif /* ENV_IS_EMBEDDED */ #ifdef DEFAULT_ENV_IS_RW -extern unsigned char default_environment[]; +extern char default_environment[]; #else -extern const unsigned char default_environment[]; +extern const char default_environment[]; #endif #ifndef DO_DEPS_ONLY diff --git a/include/image.h b/include/image.h index 34d13ada84b..fd662e74b41 100644 --- a/include/image.h +++ b/include/image.h @@ -1159,7 +1159,7 @@ struct image_sign_info { const char *keydir; /* Directory conaining keys */ const char *keyname; /* Name of key to use */ const char *keyfile; /* Filename of private or public key */ - void *fit; /* Pointer to FIT blob */ + const void *fit; /* Pointer to FIT blob */ int node_offset; /* Offset of signature node */ const char *name; /* Algorithm name */ struct checksum_algo *checksum; /* Checksum algorithm information */ |