From 6a00113de8b9060a7227bcfa79b3786e3e592a33 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 13 Jul 2017 02:20:27 +0200 Subject: Rename __attribute__((packed)) --> __packed Also unify __attribute__ ((..)) to __attribute__((..)) and handle ((__packed__)) like ((packed)) Change-Id: Ie60a51c3fa92b5009724a5b7c2932e361bf3490c Signed-off-by: Stefan Reinauer Reviewed-on: https://review.coreboot.org/15921 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/allwinner/a10/clock.h | 3 ++- src/cpu/allwinner/a10/gpio.h | 5 +++-- src/cpu/allwinner/a10/timer.h | 15 ++++++++------- src/cpu/allwinner/a10/uart.h | 3 ++- 4 files changed, 15 insertions(+), 11 deletions(-) (limited to 'src/cpu/allwinner/a10') diff --git a/src/cpu/allwinner/a10/clock.h b/src/cpu/allwinner/a10/clock.h index 31bfc66041..815a94d139 100644 --- a/src/cpu/allwinner/a10/clock.h +++ b/src/cpu/allwinner/a10/clock.h @@ -23,6 +23,7 @@ #include "memmap.h" #include +#include /* CPU_AHB_APB0 config values */ #define CPU_CLK_SRC_MASK (3 << 16) @@ -267,7 +268,7 @@ struct a10_ccm { u32 mali_clk_cfg; /* 0x154 */ u8 res7[0x4]; u32 mbus_clk_cfg; /* 0x15c */ -} __attribute__ ((packed)); +} __packed; void a1x_periph_clock_enable(enum a1x_clken periph); void a1x_periph_clock_disable(enum a1x_clken periph); diff --git a/src/cpu/allwinner/a10/gpio.h b/src/cpu/allwinner/a10/gpio.h index 8d95074d63..a126801000 100644 --- a/src/cpu/allwinner/a10/gpio.h +++ b/src/cpu/allwinner/a10/gpio.h @@ -19,6 +19,7 @@ #define __CPU_ALLWINNER_A10_PINMUX_H #include +#include #define GPIO_BASE 0x01C20800 @@ -42,7 +43,7 @@ struct a10_gpio_port { u32 dat; u32 drv[2]; u32 pul[2]; -} __attribute__ ((packed)); +} __packed; struct a10_gpio { struct a10_gpio_port port[10]; @@ -58,7 +59,7 @@ struct a10_gpio { u32 sdr_pad_drv; u32 sdr_pad_pul; -} __attribute__ ((packed)); +} __packed; /* gpio.c */ void gpio_set(u8 port, u8 pin); diff --git a/src/cpu/allwinner/a10/timer.h b/src/cpu/allwinner/a10/timer.h index 7e10f2f2dd..e24bf6618b 100644 --- a/src/cpu/allwinner/a10/timer.h +++ b/src/cpu/allwinner/a10/timer.h @@ -23,6 +23,7 @@ #include "memmap.h" #include +#include /* TMRx_CTRL values */ #define TIMER_CTRL_MODE_SINGLE (1 << 7) @@ -48,7 +49,7 @@ struct a1x_timer { u32 interval; u32 val; u8 res[4]; -} __attribute__ ((packed)); +} __packed; /* Audio video sync*/ struct a1x_avs { @@ -56,27 +57,27 @@ struct a1x_avs { u32 cnt0; /* 0x84 */ u32 cnt1; /* 0x88 */ u32 div; /* 0x8c */ -} __attribute__ ((packed)); +} __packed; /* Watchdog */ struct a1x_wdog { u32 ctrl; /* 0x90 */ u32 mode; /* 0x94 */ -} __attribute__ ((packed)); +} __packed; /* 64 bit counter */ struct a1x_64cnt { u32 ctrl; /* 0xa0 */ u32 lo; /* 0xa4 */ u32 hi; /* 0xa8 */ -} __attribute__ ((packed)); +} __packed; /* Rtc */ struct a1x_rtc { u32 ctrl; /* 0x100 */ u32 yymmdd; /* 0x104 */ u32 hhmmss; /* 0x108 */ -} __attribute__ ((packed)); +} __packed; /* Alarm */ struct a1x_alarm { @@ -85,7 +86,7 @@ struct a1x_alarm { u32 en; /* 0x114 */ u32 irq_en; /* 0x118 */ u32 irq_sta; /* 0x11c */ -} __attribute__ ((packed)); +} __packed; struct a1x_timer_module { u32 irq_en; /* 0x00 */ @@ -103,7 +104,7 @@ struct a1x_timer_module { u32 gp_data[4]; u8 res5[8]; u32 cpu_cfg; -} __attribute__ ((packed)); +} __packed; u8 a1x_get_cpu_chip_revision(void); diff --git a/src/cpu/allwinner/a10/uart.h b/src/cpu/allwinner/a10/uart.h index a5ed2a9f70..92a87e5d11 100644 --- a/src/cpu/allwinner/a10/uart.h +++ b/src/cpu/allwinner/a10/uart.h @@ -26,6 +26,7 @@ #define CPU_ALLWINNER_A10_UART_H #include +#include struct a10_uart { union { @@ -71,7 +72,7 @@ struct a10_uart { u8 reserved_0xa0[4]; u32 halt; /* Halt register */ -} __attribute__ ((packed)); +} __packed; enum uart_parity { UART_PARITY_NONE, -- cgit v1.2.3