diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/env.h | 8 | ||||
| -rw-r--r-- | include/env/adi/adi_boot.env | 1 | ||||
| -rw-r--r-- | include/image.h | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/env.h b/include/env.h index 9b872fb26eb..8bd6cf23932 100644 --- a/include/env.h +++ b/include/env.h @@ -9,7 +9,6 @@ #ifndef __ENV_H #define __ENV_H -#include <config.h> #include <compiler.h> #include <stdbool.h> #include <linux/types.h> @@ -174,10 +173,11 @@ int env_set(const char *varname, const char *value); */ static inline int env_set_runtime(const char *varname, const char *value) { - if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) - return env_set(varname, value); - +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + return env_set(varname, value); +#else return 0; +#endif } /** diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env index 3c83826cf9a..a3e308e6404 100644 --- a/include/env/adi/adi_boot.env +++ b/include/env/adi/adi_boot.env @@ -7,6 +7,7 @@ /* Config options */ ethaddr=02:80:ad:20:31:e8 eth1addr=02:80:ad:20:31:e9 +fdtfile=CONFIG_DEFAULT_FDT_FILE httpdstp=8000 uart_console=CONFIG_UART_CONSOLE #ifdef CONFIG_SC59X_64 diff --git a/include/image.h b/include/image.h index 6edcb1995bf..1de0a84007a 100644 --- a/include/image.h +++ b/include/image.h @@ -1263,10 +1263,10 @@ int fit_image_get_load(const void *fit, int noffset, ulong *load); int fit_image_get_entry(const void *fit, int noffset, ulong *entry); int fit_image_get_emb_data(const void *fit, int noffset, const void **data, size_t *size); -int fit_image_get_data_offset(const void *fit, int noffset, int *data_offset); +int fit_image_get_data_offset(const void *fit, int noffset, u32 *data_offset); int fit_image_get_data_position(const void *fit, int noffset, - int *data_position); -int fit_image_get_data_size(const void *fit, int noffset, int *data_size); + u32 *data_position); +int fit_image_get_data_size(const void *fit, int noffset, u32 *data_size); int fit_image_get_data_size_unciphered(const void *fit, int noffset, size_t *data_size); int fit_image_get_data(const void *fit, int noffset, const void **data, |