aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-04-23 14:10:56 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2013-04-23 14:10:56 -0700
commit59783d39c150f30858d048499360f5384dc4f8b3 (patch)
tree87ba9a86c7708b5667a37e4f5f90529ec4c9e14a
parent66288c2f5af25cffa4249ab9dd2eeb2561bf71bd (diff)
parent132ff5591e48f6b5a73746393e3348fc10d68a1f (diff)
downloadlk-59783d39c150f30858d048499360f5384dc4f8b3.tar.gz
Merge "app: aboot: Use cache line aligned buffer"
-rw-r--r--app/aboot/aboot.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 78bfd44c..d13ddecd 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -35,6 +35,7 @@
#include <arch/arm.h>
#include <dev/udc.h>
#include <string.h>
+#include <stdlib.h>
#include <kernel/thread.h>
#include <arch/ops.h>
@@ -498,9 +499,9 @@ unsigned page_mask = 0;
#define ROUND_TO_PAGE(x,y) (((x) + (y)) & (~(y)))
-static unsigned char buf[4096]; //Equal to max-supported pagesize
+BUF_DMA_ALIGN(buf, 4096); //Equal to max-supported pagesize
#if DEVICE_TREE
-static unsigned char dt_buf[4096];
+BUF_DMA_ALIGN(dt_buf, 4096);
#endif
int boot_linux_from_mmc(void)
@@ -1013,7 +1014,7 @@ continue_boot:
return 0;
}
-unsigned char info_buf[4096];
+BUF_DMA_ALIGN(info_buf, 4096);
void write_device_info_mmc(device_info *dev)
{
struct device_info *info = (void*) info_buf;
@@ -1340,8 +1341,8 @@ void cmd_erase(const char *arg, void *data, unsigned sz)
void cmd_erase_mmc(const char *arg, void *data, unsigned sz)
{
+ BUF_DMA_ALIGN(out, 512);
unsigned long long ptn = 0;
- unsigned int out[512] = {0};
int index = INVALID_PTN;
index = partition_get_index(arg);