diff --git a/src/vendorcode/amd/fsp/picasso/FspmUpd.h b/src/vendorcode/amd/fsp/picasso/FspmUpd.h
index 276b2fcd46..3be69c3360 100644
--- a/src/vendorcode/amd/fsp/picasso/FspmUpd.h
+++ b/src/vendorcode/amd/fsp/picasso/FspmUpd.h
@@ -9,12 +9,9 @@
 
 #include <FspUpd.h>
 
-#pragma pack(1)
-
-
 /** Fsp M Configuration
 **/
-typedef struct {
+typedef struct __packed {
 	/** Offset 0x0040**/	uint32_t                    pci_express_base_addr;
 	/** Offset 0x0044**/	uint32_t                    serial_port_base;
 	/** Offset 0x0048**/	uint32_t                    serial_port_use_mmio;
@@ -71,12 +68,10 @@ typedef struct {
 
 /** Fsp M UPD Configuration
 **/
-typedef struct {
+typedef struct __packed {
 	/** Offset 0x0000**/	FSP_UPD_HEADER              FspUpdHeader;
 	/** Offset 0x0020**/	FSPM_ARCH_UPD               FspmArchUpd;
 	/** Offset 0x0040**/	FSP_M_CONFIG                FspmConfig;
 } FSPM_UPD;
 
-#pragma pack()
-
 #endif
diff --git a/src/vendorcode/amd/fsp/picasso/FspsUpd.h b/src/vendorcode/amd/fsp/picasso/FspsUpd.h
index 2dcc617a9e..5a408316ff 100644
--- a/src/vendorcode/amd/fsp/picasso/FspsUpd.h
+++ b/src/vendorcode/amd/fsp/picasso/FspsUpd.h
@@ -9,10 +9,7 @@
 
 #include <FspUpd.h>
 
-#pragma pack(1)
-
-
-typedef struct {
+typedef struct __packed {
 	/** Offset 0x0020**/	uint32_t                    emmc0_mode;
 	/** Offset 0x0024**/	uint8_t                     unused0[12];
 	/** Offset 0x0030**/	uint8_t                     dxio_descriptor0[16];
@@ -51,11 +48,9 @@ typedef struct {
 
 /** Fsp S UPD Configuration
 **/
-typedef struct {
+typedef struct __packed {
 	/** Offset 0x0000**/	FSP_UPD_HEADER              FspUpdHeader;
 	/** Offset 0x0020**/	FSP_S_CONFIG                FspsConfig;
 } FSPS_UPD;
 
-#pragma pack()
-
 #endif