From: Rasmus Villemoes <ravi@prevas.dk>
Date: Wed, 4 Jun 2025 19:56:06 +0000 (+0200)
Subject: m68k: drop pointless #if 0 block
X-Git-Tag: v2025.10-rc1~118^2~18^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f3d70a6bc2f99ac86f47bc5697d7e6e36ea7b8;p=pandora-u-boot.git

m68k: drop pointless #if 0 block

The way DECLARE_GLOBAL_DATA_PTR is used, the stuff under #if 0 can
never compile as you cannot have a non-constant initializer at global
scope (and one would get linker errors as well because the 'gd' symbol
would be defined in multiple TUs).

Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
Acked-by: Angelo Dureghello <angelo@kernel-space.org>
---

diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h
index 29b46645676..aea2ccabe08 100644
--- a/arch/m68k/include/asm/global_data.h
+++ b/arch/m68k/include/asm/global_data.h
@@ -32,11 +32,6 @@ struct arch_global_data {
 
 #include <asm-generic/global_data.h>
 
-#if 0
-extern gd_t *global_data;
-#define DECLARE_GLOBAL_DATA_PTR     gd_t *gd = global_data
-#else
 #define DECLARE_GLOBAL_DATA_PTR     register gd_t *gd asm ("d7")
-#endif
 
 #endif /* __ASM_GBL_DATA_H */