global_data: Move pointer members together

Collect the pointer members near the top of global_data to help with
alignment.

Signed-off-by: Simon Glass <[email protected]>

1 files changed, 19 insertions, 19 deletions

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 05a0f6f0ff9..58dbfd6fa14 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -43,6 +43,25 @@ struct global_data {
 	 * @bd: board information
 	 */
 	struct bd_info *bd;
+	/**
+	 * @new_gd: pointer to relocated global data
+	 */
+	struct global_data *new_gd;
+	/**
+	 * @fdt_blob: U-Boot's own device tree, NULL if none
+	 */
+	const void *fdt_blob;
+	/**
+	 * @jt: jump table
+	 *
+	 * The jump table contains pointers to exported functions. A pointer to
+	 * the jump table is passed to standalone applications.
+	 */
+	struct jt_funcs *jt;
+	/**
+	 * @cur_serial_dev: current serial device
+	 */
+	struct udevice *cur_serial_dev;
 #ifndef CONFIG_SPL_BUILD
 	/**
 	 * @boardf: information only used before relocation
@@ -132,33 +151,14 @@ struct global_data {
 	 */
 	char env_load_prio;
 	/**
-	 * @new_gd: pointer to relocated global data
-	 */
-	struct global_data *new_gd;
-	/**
-	 * @fdt_blob: U-Boot's own device tree, NULL if none
-	 */
-	const void *fdt_blob;
-	/**
 	 * @fdt_src: Source of FDT
 	 */
 	enum fdt_source_t fdt_src;
 	/**
-	 * @jt: jump table
-	 *
-	 * The jump table contains pointers to exported functions. A pointer to
-	 * the jump table is passed to standalone applications.
-	 */
-	struct jt_funcs *jt;
-	/**
 	 * @env_buf: buffer for env_get() before reloc
 	 */
 	char env_buf[32];
 	/**
-	 * @cur_serial_dev: current serial device
-	 */
-	struct udevice *cur_serial_dev;
-	/**
 	 * @arch: architecture-specific data
 	 */
 	struct arch_global_data arch;