summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElyes Haouas <ehaouas@noos.fr>2023-09-07 19:40:56 +0200
committerElyes Haouas <ehaouas@noos.fr>2023-09-09 04:45:33 +0000
commit2dc5c6e2cc303b18b2c1434c0482ba68b6c4dc29 (patch)
treeac9f489a9b699d379bb507ede4402b6acae5c0b0
parent25a7af18a5e789a7930015ab08d72ea62f5be71a (diff)
soc/amd/common: Remove __attribute__(())
Change-Id: I2866dcdd6900c98310b4b3736b40ebe4eaa77ea2 Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/77719 Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/common/block/apob/apob_cache.c2
-rw-r--r--src/soc/amd/common/block/include/amdblocks/psp_efs.h4
-rw-r--r--src/soc/amd/common/block/psp/psp_def.h8
-rw-r--r--src/soc/amd/common/block/psp/psp_smm.c4
-rw-r--r--src/soc/amd/common/psp_verstage/vboot_crypto.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/soc/amd/common/block/apob/apob_cache.c b/src/soc/amd/common/block/apob/apob_cache.c
index 06dc5977c7..713826a297 100644
--- a/src/soc/amd/common/block/apob/apob_cache.c
+++ b/src/soc/amd/common/block/apob/apob_cache.c
@@ -113,7 +113,7 @@ static enum cb_err get_nv_rdev_rw(struct region_device *r)
}
static struct apob_thread_context {
- uint8_t buffer[DEFAULT_MRC_CACHE_SIZE] __attribute__((aligned(64)));
+ uint8_t buffer[DEFAULT_MRC_CACHE_SIZE] __aligned(64);
struct thread_handle handle;
struct region_device apob_rdev;
} global_apob_thread;
diff --git a/src/soc/amd/common/block/include/amdblocks/psp_efs.h b/src/soc/amd/common/block/include/amdblocks/psp_efs.h
index 02f027c8b4..d0b9b016d2 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp_efs.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp_efs.h
@@ -24,7 +24,7 @@
struct second_gen_efs { /* todo: expand for Server products */
uint32_t gen:1; /* Client products only use bit 0 */
uint32_t reserved:31;
-} __attribute__((packed));
+} __packed;
#define EFS_SECOND_GEN 0
@@ -59,7 +59,7 @@ struct embedded_firmware {
uint8_t reserved_4Ah;
uint8_t reserved_4Bh;
uint32_t reserved_4Ch;
-} __attribute__((packed, aligned(16)));
+} __packed __aligned(16);
bool read_efs_spi_settings(uint8_t *mode, uint8_t *speed);
diff --git a/src/soc/amd/common/block/psp/psp_def.h b/src/soc/amd/common/block/psp/psp_def.h
index 773a9447d5..9def98bff1 100644
--- a/src/soc/amd/common/block/psp/psp_def.h
+++ b/src/soc/amd/common/block/psp/psp_def.h
@@ -58,7 +58,7 @@ struct mbox_buffer_header {
struct mbox_default_buffer { /* command-response buffer unused by command */
struct mbox_buffer_header header;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
struct smm_req_buffer {
uint64_t smm_base; /* TSEG base */
@@ -76,17 +76,17 @@ struct smm_req_buffer {
struct mbox_cmd_smm_info_buffer {
struct mbox_buffer_header header;
struct smm_req_buffer req;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
struct mbox_cmd_sx_info_buffer {
struct mbox_buffer_header header;
u8 sleep_type;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
struct mbox_cmd_late_spl_buffer {
struct mbox_buffer_header header;
uint32_t spl_value;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
struct dtpm_config {
uint32_t gpio;
diff --git a/src/soc/amd/common/block/psp/psp_smm.c b/src/soc/amd/common/block/psp/psp_smm.c
index 49e48e3d48..2112e868f6 100644
--- a/src/soc/amd/common/block/psp/psp_smm.c
+++ b/src/soc/amd/common/block/psp/psp_smm.c
@@ -16,11 +16,11 @@
struct {
u8 buffer[C2P_BUFFER_MAXSIZE];
-} __attribute__((aligned(32))) c2p_buffer;
+} __aligned(32) c2p_buffer;
struct {
u8 buffer[P2C_BUFFER_MAXSIZE];
-} __attribute__((aligned(32))) p2c_buffer;
+} __aligned(32) p2c_buffer;
static uint32_t smm_flag; /* Non-zero for SMM, clear when not */
diff --git a/src/soc/amd/common/psp_verstage/vboot_crypto.c b/src/soc/amd/common/psp_verstage/vboot_crypto.c
index 8c1f31336a..b2c0c563f8 100644
--- a/src/soc/amd/common/psp_verstage/vboot_crypto.c
+++ b/src/soc/amd/common/psp_verstage/vboot_crypto.c
@@ -15,7 +15,7 @@
static struct sha_generic_data sha_op;
static uint32_t sha_op_size_remaining;
-static uint8_t __attribute__((aligned(32))) sha_hash[64];
+static uint8_t __aligned(32) sha_hash[64];
vb2_error_t vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg, uint32_t data_size)
{