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 c959774adff386ebf2c17d14bbfeee81a286a0ec..a2be57756a1e5c735935aa6df3fb857b7b548f82 100644 (file)
--- 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 cc369fcdfb9e3c7a628bb53a7a713d0d6a69f832..21552650025a108f4136267e4c63ea01584ea34c 100644 (file)
--- 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