util/amdfwtool: Fix all warnings

Fixes these warnings:

warning: alignment 1 of 'struct _psp_directory_table' is less
than 16 [-Wpacked-not-aligned]

warning: alignment 1 of 'struct _psp_combo_directory' is less
 than 16 [-Wpacked-not-aligned]

In function 'find_register_fw_filename_bios_dir':
warning: implicit conversion from 'enum _amd_fw_type' to
'amd_bios_type' {aka 'enum _amd_bios_type'} [-Wenum-conversion]

BUG=None
TEST=Build and verify binaries are identical.

Signed-off-by: Martin Roth <martin@coreboot.org>
Change-Id: I761d9893ac6737b42af96c4b2a57c5a4fc61ab05
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50643
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

util/amdfwtool/amdfwtool.c

@@ -396,7 +396,7 @@ typedef struct _psp_directory_entry {
 typedef struct _psp_directory_table {
 	psp_directory_header header;
 	psp_directory_entry entries[];
-} __attribute__((packed)) psp_directory_table;
+} __attribute__((packed, aligned(16))) psp_directory_table;
 
 #define MAX_PSP_ENTRIES 0x1f
 
@@ -417,7 +417,7 @@ typedef struct _psp_combo_entry {
 typedef struct _psp_combo_directory {
 	psp_combo_header header;
 	psp_combo_entry entries[];
-} __attribute__((packed)) psp_combo_directory;
+} __attribute__((packed, aligned(16))) psp_combo_directory;
 
 #define MAX_COMBO_ENTRIES 1
 

util/amdfwtool/data_parse.c

@@ -321,7 +321,7 @@ static uint8_t find_register_fw_filename_bios_dir(char *fw_name, char *filename,
 			fw_type = AMD_BIOS_MP2_CFG;
 			subprog = 0;
 		} else {
-			fw_type = AMD_FW_SKIP;
+			fw_type = AMD_BIOS_SKIP;
 		}
 	} else {
 		fw_type = AMD_BIOS_INVALID;