summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2017-08-25 12:40:50 -0600
committerAaron Durbin <adurbin@chromium.org>2017-08-26 16:26:45 +0000
commitb26e01a06718cc1a49a7c277c831b572a7301210 (patch)
treeff0c24650a496d4524d9029a5d87f54d16721fbc
parent97a09454d25bc19b80ae990743602ba0f943a9c0 (diff)
soc/intel/cannonlake: use __packed
Now that there is a handy macro utilize it. Change-Id: I560bc7a591075235229952cdea63d4e667f323ee Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/21204 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Lijian Zhao <lijian.zhao@intel.com> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/soc/intel/cannonlake/include/soc/pm.h3
-rw-r--r--src/soc/intel/cannonlake/reset.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/soc/intel/cannonlake/include/soc/pm.h b/src/soc/intel/cannonlake/include/soc/pm.h
index abf7db9b32..58037bd488 100644
--- a/src/soc/intel/cannonlake/include/soc/pm.h
+++ b/src/soc/intel/cannonlake/include/soc/pm.h
@@ -19,6 +19,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
+#include <compiler.h>
#include <soc/gpe.h>
#include <soc/iomap.h>
#include <soc/smbus.h>
@@ -151,7 +152,7 @@ struct chipset_power_state {
uint32_t gen_pmcon_b;
uint32_t gblrst_cause[2];
uint32_t prev_sleep_state;
-} __attribute__ ((packed));
+} __packed;
/* Return the selected ACPI SCI IRQ */
int acpi_sci_irq(void);
diff --git a/src/soc/intel/cannonlake/reset.c b/src/soc/intel/cannonlake/reset.c
index 918c8c7bf9..ca82bd6ac4 100644
--- a/src/soc/intel/cannonlake/reset.c
+++ b/src/soc/intel/cannonlake/reset.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <compiler.h>
#include <console/console.h>
#include <intelblocks/cse.h>
#include <fsp/util.h>
@@ -40,7 +41,7 @@ static int send_heci_reset_message(void)
u8 command;
u8 reserved;
u8 result;
- } __attribute__ ((packed)) reply;
+ } __packed reply;
struct reset_message {
u8 group_id;
u8 cmd;
@@ -48,7 +49,7 @@ static int send_heci_reset_message(void)
u8 result;
u8 req_origin;
u8 reset_type;
- } __attribute__ ((packed));
+ } __packed;
struct reset_message msg = {
.cmd = MKHI_GLOBAL_RESET,
.group_id = 0,