Merge git://git.denx.de/u-boot-marvell
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 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 @@
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