[U-Boot] [PATCH] Revert "Align global_data to a 16-byte boundary"

* [U-Boot] [PATCH] Revert "Align global_data to a 16-byte boundary"
@ 2015-08-17 15:28 Simon Glass
  2015-08-18  0:53 ` Tom Rini
  0 siblings, 1 reply; 4+ messages in thread
From: Simon Glass @ 2015-08-17 15:28 UTC (permalink / raw)
  To: u-boot

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>
---

 common/board_f.c                  | 1 -
 include/asm-generic/global_data.h | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c
index c959774..a2be577 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 cc369fc..2155265 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
 
-- 
2.5.0.276.gf5e568e

^ permalink raw reply related	[flat|nested] 4+ messages in thread