5 files changed, 20 insertions, 14 deletions

diff --git a/src/cpu/ti/am335x/clock.h b/src/cpu/ti/am335x/clock.h
index c1f1926852..564838a0e4 100644
--- a/src/cpu/ti/am335x/clock.h
+++ b/src/cpu/ti/am335x/clock.h
@@ -16,6 +16,7 @@
 #define __CPU_TI_AM335X_CLOCK_H__
 
 #include <stdint.h>
+#include <compiler.h>
 
 enum {
 	CM_ST_NO_SLEEP = 0x0,
@@ -106,7 +107,7 @@ struct am335x_cm_per_regs {
 	uint32_t lcdc_st;		// 0x148
 	uint32_t clkdiv32k;		// 0x14c
 	uint32_t clk_24mhz_st;		// 0x150
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_per_regs * const am335x_cm_per = (void *)0x44e00000;
 
 /* Clock module wakeup registers */
@@ -166,7 +167,7 @@ struct am335x_cm_wkup_regs {
 	uint8_t _rsv0[4];		// 0xd0-0xd3
 	uint32_t wkup_wdt1;		// 0xd4
 	uint32_t div_m6_dpll_core;	// 0xd8
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_wkup_regs * const am335x_cm_wkup = (void *)0x44e00400;
 
 /* Clock module pll registers */
@@ -187,20 +188,20 @@ struct am335x_cm_dpll_regs {
 	uint32_t clksel_lcdc_pixel_clk;	// 0x34
 	uint32_t clksel_wdt1_clk;	// 0x38
 	uint32_t clksel_gpio0_dbclk;	// 0x3c
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_dpll_regs * const am335x_cm_dpll = (void *)0x44e00500;
 
 /* Clock module mpu registers */
 struct am335x_cm_mpu_regs {
 	uint32_t st;			// 0x0
 	uint32_t mpu;			// 0x4
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_mpu_regs * const am335x_cm_mpu = (void *)0x44e00600;
 
 /* Clock module device registers */
 struct am335x_cm_device_regs {
 	uint32_t cm_clkout_ctrl;	// 0x0
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_device_regs * const am335x_cm_device =
 		(void *)0x44e00700;
 
@@ -208,7 +209,7 @@ static struct am335x_cm_device_regs * const am335x_cm_device =
 struct am335x_cm_rtc_regs {
 	uint32_t rtc;			// 0x0
 	uint32_t st;			// 0x4
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_rtc_regs * const am335x_cm_rtc = (void *)0x44e00800;
 
 /* Clock module graphics controller registers */
@@ -219,7 +220,7 @@ struct am335x_cm_gfx_regs {
 	uint32_t l4ls_gfx_st;		// 0xc
 	uint32_t mmucfg;		// 0x10
 	uint32_t mmudata;		// 0x14
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_gfx_regs * const am335x_cm_gfx = (void *)0x44e00900;
 
 /* Clock module efuse registers */
@@ -227,7 +228,7 @@ struct am335x_cm_cefuse_regs {
 	uint32_t st;			// 0x0
 	uint8_t _rsv0[0x1c];		// 0x4-0x1f
 	uint32_t cefuse;		// 0x20
-} __attribute__((packed));
+} __packed;
 static struct am335x_cm_cefuse_regs * const am335x_cm_cefuse =
 		(void *)0x44e00a00;
 
diff --git a/src/cpu/ti/am335x/gpio.h b/src/cpu/ti/am335x/gpio.h
index 4f4e635202..41fc3d358e 100644
--- a/src/cpu/ti/am335x/gpio.h
+++ b/src/cpu/ti/am335x/gpio.h
@@ -16,6 +16,7 @@
 #define __CPU_TI_AM335X_GPIO_H__
 
 #include <stdint.h>
+#include <compiler.h>
 
 enum {
 	AM335X_GPIO_BITS_PER_BANK = 32
@@ -53,7 +54,7 @@ struct am335x_gpio_regs {
 	uint8_t _rsv4[0x38];		// 0x158-0x18f
 	uint32_t cleardataout;		// 0x190
 	uint32_t setdataout;		// 0x194
-} __attribute__((packed));
+} __packed;
 
 static struct am335x_gpio_regs * const am335x_gpio_banks[] = {
 	(void *)0x44e07000, (void *)0x4804c000,
diff --git a/src/cpu/ti/am335x/header.c b/src/cpu/ti/am335x/header.c
index d59e29749d..a260425f48 100644
--- a/src/cpu/ti/am335x/header.c
+++ b/src/cpu/ti/am335x/header.c
@@ -15,6 +15,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <symbols.h>
+#include <compiler.h>
 
 #include "header.h"
 
@@ -25,7 +26,7 @@ struct config_headers {
 
 	// An inert instance of chsettings.
 	struct configuration_header_settings chsettings;
-} __attribute__((packed));
+} __packed;
 
 struct omap_image_headers {
 	union {
diff --git a/src/cpu/ti/am335x/header.h b/src/cpu/ti/am335x/header.h
index 43a628065a..64d75c7512 100644
--- a/src/cpu/ti/am335x/header.h
+++ b/src/cpu/ti/am335x/header.h
@@ -16,6 +16,7 @@
 #define __CPU_TI_AM335X_HEADER_H
 
 #include <stdint.h>
+#include <compiler.h>
 
 struct configuration_header_toc_item {
 	// Offset from the start address of the TOC to the actual address of
@@ -30,7 +31,7 @@ struct configuration_header_toc_item {
 
 	// 12-character name of a section, including the zero (\0) terminator.
 	char filename[12];
-} __attribute__((packed));
+} __packed;
 
 struct configuration_header_settings {
 	// Key used for section verification.
@@ -49,7 +50,7 @@ struct configuration_header_settings {
 
 	// Flags. It's not clear what this is used for.
 	uint32_t flags;
-} __attribute__((packed));
+} __packed;
 
 struct gp_device_header {
 	// Size of the image.
@@ -57,6 +58,6 @@ struct gp_device_header {
 
 	// Address to store the image/code entry point.
 	uint32_t destination;
-} __attribute__((packed));
+} __packed;
 
 #endif
diff --git a/src/cpu/ti/am335x/uart.h b/src/cpu/ti/am335x/uart.h
index 07c7cc8987..7a65076b10 100644
--- a/src/cpu/ti/am335x/uart.h
+++ b/src/cpu/ti/am335x/uart.h
@@ -15,6 +15,8 @@
 #ifndef AM335X_UART_H
 #define AM335X_UART_H
 
+#include <compiler.h>
+
 #define AM335X_UART0_BASE	0x44e09000
 #define AM335X_UART1_BASE	0x48020000
 #define AM335X_UART2_BASE	0x48024000
@@ -168,6 +170,6 @@ struct am335x_uart {
 	uint8_t rsvd_0x82[2];
 	uint16_t txdma;			/* TX DMA threshold */
 
-} __attribute__((packed));
+} __packed;
 
 #endif	/* AM335X_UART_H */