Merge branch '2021-09-09-finish-pre-DM_PCI-removal'

[J-u-boot.git] / lib / asm-offsets.c

diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c
index f4f1bb8ffd5a54fe102a281e718888f6ea6c62d9..c691066332de8bc38ad52b576dbdce035ea7b6ca 100644 (file)
--- a/lib/asm-offsets.c
+++ b/lib/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+

 /*
  * Adapted from Linux v2.6.36 kernel: arch/powerpc/kernel/asm-offsets.c
  *
 /*
  * Adapted from Linux v2.6.36 kernel: arch/powerpc/kernel/asm-offsets.c
  *


@@ -8,11 +9,11 @@
  * generate asm statements containing #defines,
  * compile this file to assembler, and then extract the
  * #defines from the assembly-language output.
  * generate asm statements containing #defines,
  * compile this file to assembler, and then extract the
  * #defines from the assembly-language output.

- *
- * SPDX-License-Identifier:    GPL-2.0+

  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <asm-offsets.h>
+#include <asm/global_data.h>

 
 #include <linux/kbuild.h>
 
 
 #include <linux/kbuild.h>
 


@@ -40,5 +41,7 @@ int main(void)
 
        DEFINE(GD_NEW_GD, offsetof(struct global_data, new_gd));
 
 
        DEFINE(GD_NEW_GD, offsetof(struct global_data, new_gd));
 

+       DEFINE(GD_ENV_ADDR, offsetof(struct global_data, env_addr));
+

        return 0;
 }
        return 0;
 }