image: Rename CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT

[platform/kernel/u-boot.git] / include / image.h

diff --git a/include/image.h b/include/image.h
index 3ff3c03..b242007 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -30,10 +30,10 @@ struct fdt_region;
 #define IMAGE_ENABLE_FIT       1
 #define IMAGE_ENABLE_OF_LIBFDT 1
 #define CONFIG_FIT_VERBOSE     1 /* enable fit_format_{error,warning}() */
-#define CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT 1
-#define CONFIG_FIT_ENABLE_SHA256_SUPPORT
-#define CONFIG_FIT_ENABLE_SHA384_SUPPORT
-#define CONFIG_FIT_ENABLE_SHA512_SUPPORT
+#define CONFIG_FIT_RSASSA_PSS 1
+#define CONFIG_FIT_SHA256
+#define CONFIG_FIT_SHA384
+#define CONFIG_FIT_SHA512
 #define CONFIG_SHA1
 #define CONFIG_SHA256
 #define CONFIG_SHA384
@@ -68,7 +68,7 @@ struct fdt_region;
 #  ifdef CONFIG_SPL_MD5_SUPPORT
 #   define IMAGE_ENABLE_MD5    1
 #  endif
-#  ifdef CONFIG_SPL_SHA1_SUPPORT
+#  ifdef CONFIG_SPL_FIT_SHA1
 #   define IMAGE_ENABLE_SHA1   1
 #  endif
 # else
@@ -89,22 +89,22 @@ struct fdt_region;
 #define IMAGE_ENABLE_SHA1      0
 #endif
 
-#if defined(CONFIG_FIT_ENABLE_SHA256_SUPPORT) || \
-       defined(CONFIG_SPL_SHA256_SUPPORT)
+#if defined(CONFIG_FIT_SHA256) || \
+       defined(CONFIG_SPL_FIT_SHA256)
 #define IMAGE_ENABLE_SHA256    1
 #else
 #define IMAGE_ENABLE_SHA256    0
 #endif
 
-#if defined(CONFIG_FIT_ENABLE_SHA384_SUPPORT) || \
-       defined(CONFIG_SPL_SHA384_SUPPORT)
+#if defined(CONFIG_FIT_SHA384) || \
+       defined(CONFIG_SPL_FIT_SHA384)
 #define IMAGE_ENABLE_SHA384    1
 #else
 #define IMAGE_ENABLE_SHA384    0
 #endif
 
-#if defined(CONFIG_FIT_ENABLE_SHA512_SUPPORT) || \
-       defined(CONFIG_SPL_SHA512_SUPPORT)
+#if defined(CONFIG_FIT_SHA512) || \
+       defined(CONFIG_SPL_FIT_SHA512)
 #define IMAGE_ENABLE_SHA512    1
 #else
 #define IMAGE_ENABLE_SHA512    0
@@ -434,7 +434,7 @@ typedef struct bootm_headers {
 #define        BOOTM_STATE_OS_GO       (0x00000400)
        int             state;
 
-#ifdef CONFIG_LMB
+#if defined(CONFIG_LMB) && !defined(USE_HOSTCC)
        struct lmb      lmb;            /* for memory mgmt */
 #endif
 } bootm_headers_t;
@@ -1581,11 +1581,14 @@ int board_fit_config_name_match(const char *name);
  * into the FIT creation (i.e. the binary blobs would have been pre-processed
  * before being added to the FIT image).
  *
+ * @fit: pointer to fit image
+ * @node: offset of image node
  * @image: pointer to the image start pointer
  * @size: pointer to the image size
  * @return no return value (failure should be handled internally)
  */
-void board_fit_image_post_process(void **p_image, size_t *p_size);
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+                                 size_t *p_size);
 
 #define FDT_ERROR      ((ulong)(-1))