From: Simon Glass <sjg@chromium.org>
Date: Mon, 17 Aug 2015 15:28:44 +0000 (-0600)
Subject: Revert "Align global_data to a 16-byte boundary"
X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=2212e69bc09ac42593794b030d64415293e141ec;p=u-boot.git

Revert "Align global_data to a 16-byte boundary"

This causes widespread breakage due to the operation of the low-level code
in crt0.S and cro0_64.S for ARM at least.

The fix is not complicated but it seems safer to revert this for now.

This reverts commit 2afddae07523f23f77acd066ad1719f53d289f98.
Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/board_f.c b/common/board_f.c
index c959774adf..a2be57756a 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -499,7 +499,6 @@ static int setup_machine(void)
 static int reserve_global_data(void)
 {
 	gd->start_addr_sp -= sizeof(gd_t);
-	gd->start_addr_sp &= ~0xf;
 	gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t));
 	debug("Reserving %zu Bytes for Global Data at: %08lx\n",
 			sizeof(gd_t), gd->start_addr_sp);
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index cc369fcdfb..2155265002 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -99,8 +99,7 @@ typedef struct global_data {
 	int pcidelay_done;
 #endif
 	struct udevice *cur_serial_dev;	/* current serial device */
-	/* arch-specific data */
-	struct arch_global_data arch __attribute__((aligned(16)));
+	struct arch_global_data arch;	/* architecture-specific data */
 } gd_t;
 #endif