Skip to content

Commit 9a64e21

Browse files
rootNikolajSchlej
authored andcommitted
Improved AMD-specific structures parsing
1 parent 906a80d commit 9a64e21

File tree

5 files changed

+881
-778
lines changed

5 files changed

+881
-778
lines changed

common/descriptor.h

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,8 @@ typedef struct VSCC_TABLE_ENTRY_ {
201201
#define AMD_PSP_COMBO_DIRECTORY_HEADER_SIGNATURE 0x50535032 // "2PSP"
202202
#define AMD_PSP_BHD2_DIRECTORY_HEADER_SIGNATURE 0x44484232 // "2BHD"
203203

204-
#define AMD_EFS_GEN1 0xFFFFFFFFUL
205-
206204
#define AMD_EMBEDDED_FIRMWARE_OFFSET 0x20000
207205

208-
#define AMD_INVALID_SIZE 0xFFFFFFFFUL
209-
210-
/* An address can be relative to the image/file start but it can also be the address when
211-
* the image is mapped at 0xff000000. Used to ensure that we only attempt to read within
212-
* the limits of the file. */
213-
#define SPI_ROM_BASE 0xFF000000UL
214-
#define FILE_REL_MASK (~SPI_ROM_BASE)
215-
216206
typedef enum AMD_ADDR_MODE_ {
217207
AMD_ADDR_PHYSICAL = 0, // Physical address
218208
AMD_ADDR_REL_BIOS, // Relative to beginning of image
@@ -269,7 +259,7 @@ typedef enum AMD_FW_TYPE_ {
269259
AMD_FW_DXIO = 0x42,
270260
AMD_FW_USB_PHY = 0x44,
271261
AMD_FW_TOS_SEC_POLICY = 0x45,
272-
AMD_FET_BACKUP = 0x46,
262+
AMD_EFS_BACKUP = 0x46,
273263
AMD_FW_DRTM_TA = 0x47,
274264
AMD_FW_RECOVERYAB_A = 0x48,
275265
AMD_FW_RECOVERYAB_B = 0x4A,
@@ -364,7 +354,7 @@ typedef struct AMD_EMBEDDED_FIRMWARE_ {
364354
// Might be a BIOS directory or Combo directory table
365355
UINT32 BackupPSP_Directory;
366356
UINT32 Promontory_Firmware;
367-
UINT32 Reserved_1[6];
357+
UINT32 Reserved_1[7];
368358
} AMD_EMBEDDED_FIRMWARE;
369359

370360
#define AMD_ADDITIONAL_INFO_V0_DEF \

0 commit comments

Comments
 (0)