Revert "Merge patch series "vbe: Series part E""

This reverts commit 1fdf53ace13f745fe8ad4d2d4e79eed98088d555, reversing
changes made to e5aef1bbf11412eebd4c242b46adff5301353c30.

I had missed that this caused too much size growth on rcar3_salvator-x.

Signed-off-by: Tom Rini <[email protected]>

3 files changed, 15 insertions, 32 deletions

diff --git a/include/image.h b/include/image.h
index ab96510f62c..9be5acd8158 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1172,18 +1172,6 @@ int fit_image_get_data_and_size(const void *fit, int noffset,
 				const void **data, size_t *size);
 
 /**
- * fit_image_get_phase() - Get the phase from a FIT image
- *
- * @fit: FIT to read from
- * @offset: offset node to read
- * @phasep: Returns phase, if any
- * Return: 0 if read OK and *phasep is value, -ENOENT if there was no phase
- * property in the node, other -ve value on other error
- */
-int fit_image_get_phase(const void *fit, int offset,
-			enum image_phase_t *phasep);
-
-/**
  * fit_get_data_node() - Get verified image data for an image
  * @fit: Pointer to the FIT format image header
  * @image_uname: The name of the image node
@@ -1411,9 +1399,7 @@ int fit_check_format(const void *fit, ulong size);
  * copied into the configuration node in the FIT image. This is required to
  * match configurations with compressed FDTs.
  *
- * Returns: offset to the configuration to use if one was found, -EINVAL if
- * there a /configurations or /images node is missing, -ENOENT if no match was
- * found, -ENXIO if the FDT node has no compatible string
+ * Returns: offset to the configuration to use if one was found, -1 otherwise
  */
 int fit_conf_find_compat(const void *fit, const void *fdt);
 
diff --git a/include/spl.h b/include/spl.h
index 43b344dbc55..269e36bb441 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -268,8 +268,8 @@ enum spl_sandbox_flags {
 struct spl_image_info {
 	const char *name;
 	u8 os;
-	ulong load_addr;
-	ulong entry_point;
+	uintptr_t load_addr;
+	uintptr_t entry_point;
 #if CONFIG_IS_ENABLED(LOAD_FIT) || CONFIG_IS_ENABLED(LOAD_FIT_FULL)
 	void *fdt_addr;
 #endif
@@ -951,9 +951,9 @@ void __noreturn spl_invoke_atf(struct spl_image_info *spl_image);
  *
  * Return: bl31 params structure pointer
  */
-struct bl31_params *bl2_plat_get_bl31_params(ulong bl32_entry,
-					     ulong bl33_entry,
-					     ulong fdt_addr);
+struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry,
+					     uintptr_t bl33_entry,
+					     uintptr_t fdt_addr);
 
 /**
  * bl2_plat_get_bl31_params_default() - prepare params for bl31.
@@ -972,9 +972,9 @@ struct bl31_params *bl2_plat_get_bl31_params(ulong bl32_entry,
  *
  * Return: bl31 params structure pointer
  */
-struct bl31_params *bl2_plat_get_bl31_params_default(ulong bl32_entry,
-						     ulong bl33_entry,
-						     ulong fdt_addr);
+struct bl31_params *bl2_plat_get_bl31_params_default(uintptr_t bl32_entry,
+						     uintptr_t bl33_entry,
+						     uintptr_t fdt_addr);
 
 /**
  * bl2_plat_get_bl31_params_v2() - return params for bl31
@@ -988,9 +988,9 @@ struct bl31_params *bl2_plat_get_bl31_params_default(ulong bl32_entry,
  *
  * Return: bl31 params structure pointer
  */
-struct bl_params *bl2_plat_get_bl31_params_v2(ulong bl32_entry,
-					      ulong bl33_entry,
-					      ulong fdt_addr);
+struct bl_params *bl2_plat_get_bl31_params_v2(uintptr_t bl32_entry,
+					      uintptr_t bl33_entry,
+					      uintptr_t fdt_addr);
 
 /**
  * bl2_plat_get_bl31_params_v2_default() - prepare params for bl31.
@@ -1007,9 +1007,9 @@ struct bl_params *bl2_plat_get_bl31_params_v2(ulong bl32_entry,
  *
  * Return: bl31 params structure pointer
  */
-struct bl_params *bl2_plat_get_bl31_params_v2_default(ulong bl32_entry,
-						      ulong bl33_entry,
-						      ulong fdt_addr);
+struct bl_params *bl2_plat_get_bl31_params_v2_default(uintptr_t bl32_entry,
+						      uintptr_t bl33_entry,
+						      uintptr_t fdt_addr);
 /**
  * spl_optee_entry - entry function for optee
  *
diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index b2badaf6a97..5174bd7ac41 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -25,9 +25,6 @@
  */
 unsigned int crc8(unsigned int crc_start, const unsigned char *vptr, int len);
 
-void crc8_wd_buf(const unsigned char *input, unsigned int len,
-		 unsigned char output[1], unsigned int chunk_sz);
-
 /* lib/crc16.c - 16 bit CRC with polynomial x^16 + x^15 + x^2 + 1 */
 uint16_t crc16(uint16_t crc, const unsigned char *buffer, size_t len);