3 files changed, 8 insertions, 5 deletions
diff --git a/src/device/oprom/yabel/device.c b/src/device/oprom/yabel/device.c
index b3e5d19fdf..cd1abfb026 100644
--- a/src/device/oprom/yabel/device.c
+++ b/src/device/oprom/yabel/device.c
@@ -33,6 +33,7 @@
  *****************************************************************************/
 
 
+#include <compiler.h>
 #include "device.h"
 #include "compat/rtas.h"
 #include <string.h>
@@ -56,7 +57,7 @@ typedef struct {
 	u8 cfg_space_offset;
 	u64 address;
 	u64 size;
-} __attribute__ ((__packed__)) assigned_address_t;
+} __packed assigned_address_t;
 
 #if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_YABEL)
 /* coreboot version */
diff --git a/src/device/oprom/yabel/device.h b/src/device/oprom/yabel/device.h
index 98b5c07833..1028ef1833 100644
--- a/src/device/oprom/yabel/device.h
+++ b/src/device/oprom/yabel/device.h
@@ -36,6 +36,7 @@
 #define DEVICE_LIB_H
 
 #include <types.h>
+#include <compiler.h>
 #include <endian.h>
 #include "compat/of.h"
 #include "debug.h"
@@ -62,7 +63,7 @@ typedef struct {
 	u16 bev;		// Bootstrap Entry Vector
 	u16 reserved_2;
 	u16 sriv;		// Static Resource Information Vector
-} __attribute__ ((__packed__)) exp_header_struct_t;
+} __packed exp_header_struct_t;
 
 // a PCI Data Struct as defined in PCI 2.3 Spec Chapter 6.3.1.2
 typedef struct {
@@ -78,7 +79,7 @@ typedef struct {
 	u8 code_type;
 	u8 indicator;
 	u16 reserved_2;
-} __attribute__ ((__packed__)) pci_data_struct_t;
+} __packed pci_data_struct_t;
 
 typedef struct {
 	u8 bus;
@@ -116,7 +117,7 @@ typedef struct {
 	u64 address;
 	u64 address_offset;
 	u64 size;
-} __attribute__ ((__packed__)) translate_address_t;
+} __packed translate_address_t;
 
 // array to store address translations for this
 // device. Needed for faster address translation, so
diff --git a/src/device/oprom/yabel/pmm.h b/src/device/oprom/yabel/pmm.h
index c3abee36d5..3c96700e16 100644
--- a/src/device/oprom/yabel/pmm.h
+++ b/src/device/oprom/yabel/pmm.h
@@ -35,6 +35,7 @@
 #define _YABEL_PMM_H_
 
 #include <types.h>
+#include <compiler.h>
 
 /* PMM Structure see PMM Spec Version 1.01 Chapter 3.1.1
  * (search web for specspmm101.pdf)
@@ -54,7 +55,7 @@ typedef struct {
 	 * see interrupt.c) and the INT Handler will do the actual PMM work.
 	 */
 	u8 code[3];
-} __attribute__ ((__packed__)) pmm_information_t;
+} __packed pmm_information_t;
 
 /* This function is used to setup the PMM struct in virtual memory
  * at a certain offset */