env: Rename getenv/_f() to env_get()

[u-boot] / include / image.h

diff --git a/include/image.h b/include/image.h
index 8d380e0e848009cbfbe37c9799707f81ced3a88a..c4fe4cfb8b155fe422980530ead18040920e3fe6 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -373,7 +373,7 @@ typedef struct bootm_headers {
        bd_t            *kbd;
 #endif
 
-       int             verify;         /* getenv("verify")[0] != 'n' */
+       int             verify;         /* env_get("verify")[0] != 'n' */
 
 #define        BOOTM_STATE_START       (0x00000001)
 #define        BOOTM_STATE_FINDOS      (0x00000002)
@@ -785,7 +785,8 @@ static inline int image_check_type(const image_header_t *hdr, uint8_t type)
 }
 static inline int image_check_arch(const image_header_t *hdr, uint8_t arch)
 {
-       return (image_get_arch(hdr) == arch);
+       return (image_get_arch(hdr) == arch) ||
+               (image_get_arch(hdr) == IH_ARCH_ARM && arch == IH_ARCH_ARM64);
 }
 static inline int image_check_os(const image_header_t *hdr, uint8_t os)
 {
@@ -1269,6 +1270,11 @@ int board_fit_config_name_match(const char *name);
 void board_fit_image_post_process(void **p_image, size_t *p_size);
 #endif /* CONFIG_SPL_FIT_IMAGE_POST_PROCESS */
 
+#define FDT_ERROR      ((ulong)(-1))
+
+ulong fdt_getprop_u32(const void *fdt, int node, const char *prop);
+int fit_find_config_node(const void *fdt);
+
 /**
  * Mapping of image types to function handlers to be invoked on the associated
  * loaded images