3 files changed, 14 insertions, 14 deletions

diff --git a/src/soc/amd/picasso/psp_verstage/fch.c b/src/soc/amd/picasso/psp_verstage/fch.c
index 89e7014550..7d0b856545 100644
--- a/src/soc/amd/picasso/psp_verstage/fch.c
+++ b/src/soc/amd/picasso/psp_verstage/fch.c
@@ -70,7 +70,7 @@ static void aoac_set_bar(void *bar)
 static struct {
 	const char *name;
 	struct {
-		FCH_IO_DEVICE device;
+		enum fch_io_device device;
 		uint32_t arg0;
 	} args;
 	void (*set_bar)(void *bar);
@@ -90,7 +90,7 @@ static struct {
 uintptr_t *map_spi_rom(void)
 {
 	uintptr_t *addr = NULL;
-	struct SPIROM_INFO spi = {0};
+	struct spirom_info spi = {0};
 
 	if (svc_get_spi_rom_info(&spi))
 		printk(BIOS_DEBUG, "Error getting SPI ROM info.\n");
diff --git a/src/soc/amd/picasso/psp_verstage/svc.c b/src/soc/amd/picasso/psp_verstage/svc.c
index b847276d84..acc9c70318 100644
--- a/src/soc/amd/picasso/psp_verstage/svc.c
+++ b/src/soc/amd/picasso/psp_verstage/svc.c
@@ -53,14 +53,14 @@ void svc_delay_in_usec(uint32_t delay)
 	SVC_CALL1(SVC_DELAY_IN_MICRO_SECONDS, delay, unused);
 }
 
-uint32_t svc_get_spi_rom_info(SPIROM_INFO *spi_rom_info)
+uint32_t svc_get_spi_rom_info(struct spirom_info *spi_rom_info)
 {
 	uint32_t retval = 0;
 	SVC_CALL1(SVC_GET_SPI_INFO, (uint32_t)spi_rom_info, retval);
 	return retval;
 }
 
-uint32_t svc_map_fch_dev(FCH_IO_DEVICE io_device,
+uint32_t svc_map_fch_dev(enum fch_io_device io_device,
 		uint32_t arg1, uint32_t arg2, void **io_device_axi_addr)
 {
 	uint32_t retval = 0;
@@ -70,7 +70,7 @@ uint32_t svc_map_fch_dev(FCH_IO_DEVICE io_device,
 	return retval;
 }
 
-uint32_t svc_unmap_fch_dev(FCH_IO_DEVICE io_device, void *io_device_axi_addr)
+uint32_t svc_unmap_fch_dev(enum fch_io_device io_device, void *io_device_axi_addr)
 {
 	uint32_t retval = 0;
 	assert(io_device < FCH_IO_DEVICE_END);
@@ -96,7 +96,7 @@ uint32_t svc_unmap_spi_rom(void *spi_rom_addr)
 }
 
 uint32_t svc_update_psp_bios_dir(uint32_t *psp_dir_offset,
-		uint32_t *bios_dir_offset, DIR_OFFSET_OPERATION operation)
+		uint32_t *bios_dir_offset, enum dir_offset_operation operation)
 {
 	uint32_t retval = 0;
 	assert(operation < DIR_OFFSET_OPERATION_MAX);
@@ -105,7 +105,7 @@ uint32_t svc_update_psp_bios_dir(uint32_t *psp_dir_offset,
 	return retval;
 }
 
-uint32_t svc_save_uapp_data(UAPP_COPYBUF type, void *address,
+uint32_t svc_save_uapp_data(enum uapp_copybuf type, void *address,
 		uint32_t size)
 {
 	uint32_t retval = 0;
@@ -114,7 +114,7 @@ uint32_t svc_save_uapp_data(UAPP_COPYBUF type, void *address,
 	return retval;
 }
 
-uint32_t svc_read_timer_val(PSP_TIMER_TYPE type, uint64_t *counter_value)
+uint32_t svc_read_timer_val(enum psp_timer_type type, uint64_t *counter_value)
 {
 	unsigned int retval = 0;
 	assert(type < PSP_TIMER_TYPE_MAX);
@@ -122,7 +122,7 @@ uint32_t svc_read_timer_val(PSP_TIMER_TYPE type, uint64_t *counter_value)
 	return retval;
 }
 
-uint32_t svc_reset_system(RESET_TYPE reset_type)
+uint32_t svc_reset_system(enum reset_type reset_type)
 {
 	unsigned int retval = 0;
 	assert(reset_type < RESET_TYPE_MAX);
@@ -144,21 +144,21 @@ uint32_t svc_get_max_workbuf_size(uint32_t *size)
 	return retval;
 }
 
-uint32_t svc_crypto_sha(SHA_GENERIC_DATA *sha_op, SHA_OPERATION_MODE sha_mode)
+uint32_t svc_crypto_sha(struct sha_generic_data *sha_op, enum sha_operation_mode sha_mode)
 {
 	uint32_t retval = 0;
 	SVC_CALL2(SVC_SHA, sha_op, sha_mode, retval);
 	return retval;
 }
 
-uint32_t svc_rsa_pkcs_verify(const RSAPKCS_VERIFY_PARAMS *rsa_params)
+uint32_t svc_rsa_pkcs_verify(const struct rsapkcs_verify_params *rsa_params)
 {
 	uint32_t retval = 0;
 	SVC_CALL1(SVC_RSAPKCS_VERIFY, rsa_params, retval);
 	return retval;
 }
 
-uint32_t svc_modexp(MOD_EXP_PARAMS *mod_exp_param)
+uint32_t svc_modexp(struct mod_exp_params *mod_exp_param)
 {
 	uint32_t retval = 0;
 	SVC_CALL1(SVC_MODEXP, mod_exp_param, retval);
diff --git a/src/soc/amd/picasso/psp_verstage/vboot_crypto.c b/src/soc/amd/picasso/psp_verstage/vboot_crypto.c
index d9364d0ebe..3f7151ac11 100644
--- a/src/soc/amd/picasso/psp_verstage/vboot_crypto.c
+++ b/src/soc/amd/picasso/psp_verstage/vboot_crypto.c
@@ -11,7 +11,7 @@
 #include <swab.h>
 #include <vb2_api.h>
 
-static struct SHA_GENERIC_DATA_T sha_op;
+static struct sha_generic_data sha_op;
 static uint32_t sha_op_size_remaining;
 static uint8_t __attribute__((aligned(32))) sha_hash[64];
 
@@ -113,7 +113,7 @@ vb2_error_t vb2ex_hwcrypto_modexp(const struct vb2_public_key *key,
 	 * Since PSP expects everything in LE and *inout is BE array,
 	 * we'll use workbuf for temporary buffer for endian conversion.
 	 */
-	MOD_EXP_PARAMS mod_exp_param;
+	struct mod_exp_params mod_exp_param;
 	unsigned int key_bytes = key->arrsize * sizeof(uint32_t);
 	uint32_t *sig_swapped = workbuf32;
 	uint32_t *output_buffer = &workbuf32[key->arrsize];