diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 1252b8a..8a1a4e2 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -20,6 +20,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include <board_f.h>
 #include <cyclic.h>
 #include <event_internal.h>
 #include <fdtdec.h>
@@ -42,6 +43,12 @@
 	 * @bd: board information
 	 */
 	struct bd_info *bd;
+#ifndef CONFIG_SPL_BUILD
+	/**
+	 * @boardf: information only used before relocation
+	 */
+	struct board_f *boardf;
+#endif
 	/**
 	 * @flags: global data flags
 	 *
@@ -220,10 +227,6 @@
 	 */
 	const void *fdt_blob;
 	/**
-	 * @new_fdt: relocated device tree
-	 */
-	void *new_fdt;
-	/**
 	 * @fdt_size: space reserved for relocated device space
 	 */
 	unsigned long fdt_size;