global_data: Move ulong fields together

Move all the always-present ulong fields next to the others at the top
of global_data

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 841c1b355140e9c9661d38a386a70de10be5ab08..05a0f6f0ff9bf1b6d7ee5e6d7f73488b411af10d 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -74,6 +74,31 @@ struct global_data {
         * environment variables.
         */
        unsigned long env_addr;
+       /**
+        * @ram_base: base address of RAM used by U-Boot
+        */
+       unsigned long ram_base;
+       /**
+        * @relocaddr: start address of U-Boot in RAM
+        *
+        * After relocation this field indicates the address to which U-Boot
+        * has been relocated. It can be displayed using the bdinfo command.
+        * Its value is needed to display the source code when debugging with
+        * GDB using the 'add-symbol-file u-boot <relocaddr>' command.
+        */
+       unsigned long relocaddr;
+       /**
+        * @irq_sp: IRQ stack pointer
+        */
+       unsigned long irq_sp;
+       /**
+        * @start_addr_sp: initial stack pointer address
+        */
+       unsigned long start_addr_sp;
+       /**
+        * @reloc_off: relocation offset
+        */
+       unsigned long reloc_off;
        /**
         * @bus_clk: platform clock rate in Hz
         */
@@ -106,31 +131,6 @@ struct global_data {
         * @env_load_prio: priority of the loaded environment
         */
        char env_load_prio;
-       /**
-        * @ram_base: base address of RAM used by U-Boot
-        */
-       unsigned long ram_base;
-       /**
-        * @relocaddr: start address of U-Boot in RAM
-        *
-        * After relocation this field indicates the address to which U-Boot
-        * has been relocated. It can be displayed using the bdinfo command.
-        * Its value is needed to display the source code when debugging with
-        * GDB using the 'add-symbol-file u-boot <relocaddr>' command.
-        */
-       unsigned long relocaddr;
-       /**
-        * @irq_sp: IRQ stack pointer
-        */
-       unsigned long irq_sp;
-       /**
-        * @start_addr_sp: initial stack pointer address
-        */
-       unsigned long start_addr_sp;
-       /**
-        * @reloc_off: relocation offset
-        */
-       unsigned long reloc_off;
        /**
         * @new_gd: pointer to relocated global data
         */