aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Dykes <mardyk01@review.trustedfirmware.org>2019-12-16 16:30:12 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-12-16 16:30:12 +0000
commit69a0bfc0abf7ca48ed425d260549822d1fe1b3bb (patch)
tree3252d5f674e87f76df326d5dd27ed912d1284192
parent3c96c4b7a1e650aaf6a13e91d1beecce00a8233a (diff)
parentd31b6b55e12ed5aa334805000864eeeaca857ddb (diff)
downloadtf-a-tests-69a0bfc0abf7ca48ed425d260549822d1fe1b3bb.tar.gz
Merge "Aligning block_buffer to uint32_t"
-rw-r--r--drivers/io/vexpress_nor/io_vexpress_nor_hw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/io/vexpress_nor/io_vexpress_nor_hw.c b/drivers/io/vexpress_nor/io_vexpress_nor_hw.c
index 6e563c9f0..ada813b7e 100644
--- a/drivers/io/vexpress_nor/io_vexpress_nor_hw.c
+++ b/drivers/io/vexpress_nor/io_vexpress_nor_hw.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -8,6 +8,7 @@
#include <debug.h>
#include <mmio.h>
#include <string.h>
+#include <cdefs.h>
#include "io_vexpress_nor_internal.h"
#include "norflash.h"
@@ -405,7 +406,7 @@ lock_block:
}
/* In case of partial write we need to save the block into a temporary buffer */
-static char block_buffer[NOR_FLASH_BLOCK_SIZE];
+static char block_buffer[NOR_FLASH_BLOCK_SIZE] __aligned(sizeof(uint32_t));
int flash_partial_write(file_state_t *fp, uint32_t offset,
const uintptr_t buffer, size_t length, size_t *written)