It isn't worth the hassle of omitting this field for the app, since code
is shared between the payload and the app. Adjust the condition to avoid
a build error in the 'efi' command with the app on 64-bit ARM.
Signed-off-by: Simon Glass <s...@chromium.org>
---
Changes in v2:
- Document the x86 field better and add a comment for ARM too
- Mention '64-bit ARM' here, rather than just 'ARM'
arch/arm/include/asm/global_data.h | 4 ++--
arch/x86/include/asm/global_data.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/global_data.h
b/arch/arm/include/asm/global_data.h
index 8d51111f095..ba12da6204e 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -108,8 +108,8 @@ struct arch_global_data {
#ifdef CONFIG_SMBIOS
ulong smbios_start; /* Start address of SMBIOS table */
#endif
-#ifdef CONFIG_EFI_STUB
- ulong table;
+#ifdef CONFIG_EFI
+ ulong table; /* holds the table address from previous EFI firmware */
#endif
};
diff --git a/arch/x86/include/asm/global_data.h
b/arch/x86/include/asm/global_data.h
index 1bd1fa92078..0d9fa823121 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -110,7 +110,7 @@ struct arch_global_data {
int has_mtrr;
/* MRC training data */
struct mrc_output mrc[MRC_TYPE_COUNT];
- ulong table; /* Table pointer from previous loader */
+ ulong table; /* coreboot/EFI table address from previous loader */
int turbo_state; /* Current turbo state */
struct irq_routing_table *pirq_routing_table;
int dw_i2c_num_cards; /* Used by designware i2c driver */
--
2.43.0
