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 221ebbf1771e06a9ae0b8f8e312b095e12348ffa..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
  *
@@ -8,11 +9,11 @@
  * 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 <asm-offsets.h>
+#include <asm/global_data.h>
 
 #include <linux/kbuild.h>
 
@@ -28,7 +29,7 @@ int main(void)
        DEFINE(GD_SIZE, sizeof(struct global_data));
 
        DEFINE(GD_BD, offsetof(struct global_data, bd));
-#ifdef CONFIG_SYS_MALLOC_F_LEN
+#if CONFIG_VAL(SYS_MALLOC_F_LEN)
        DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base));
 #endif
 
@@ -38,5 +39,9 @@ int main(void)
 
        DEFINE(GD_START_ADDR_SP, offsetof(struct global_data, start_addr_sp));
 
+       DEFINE(GD_NEW_GD, offsetof(struct global_data, new_gd));
+
+       DEFINE(GD_ENV_ADDR, offsetof(struct global_data, env_addr));
+
        return 0;
 }