karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / arch / arm / include / asm / global_data.h

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 0649a4636de5b1b4fce619dd18095bcce164deed..5fb6506f4ead0b1ac44bb0ec18620419e1813b55 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -17,9 +17,18 @@ struct arch_global_data {
 #if defined(CONFIG_FSL_ESDHC)
        u32 sdhc_clk;
 #endif
+
+#if defined(CONFIG_U_QE)
+       u32 qe_clk;
+       u32 brg_clk;
+       uint mp_alloc_base;
+       uint mp_alloc_top;
+#endif /* CONFIG_U_QE */
+
 #ifdef CONFIG_VIDEO_IPUV3
        unsigned int    ipu_hw_rev;
 #endif
+
 #ifdef CONFIG_AT91FAMILY
        /* "static data" needed by at91's clock.c */
        unsigned long   cpu_clk_rate_hz;
@@ -35,9 +44,6 @@ struct arch_global_data {
        unsigned long tbl;
        unsigned long lastinc;
        unsigned long long timer_reset_value;
-#ifdef CONFIG_IXP425
-       unsigned long timestamp;
-#endif
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
        unsigned long tlb_addr;
        unsigned long tlb_size;
@@ -50,6 +56,35 @@ struct arch_global_data {
 
 #include <asm-generic/global_data.h>
 
-#define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r8")
+#ifdef __clang__
+
+#define DECLARE_GLOBAL_DATA_PTR
+#define gd     get_gd()
+
+static inline gd_t *get_gd(void)
+{
+       gd_t *gd_ptr;
+
+#ifdef CONFIG_ARM64
+       /*
+        * Make will already error that reserving x18 is not supported at the
+        * time of writing, clang: error: unknown argument: '-ffixed-x18'
+        */
+       __asm__ volatile("mov %0, x18\n" : "=r" (gd_ptr));
+#else
+       __asm__ volatile("mov %0, r9\n" : "=r" (gd_ptr));
+#endif
+
+       return gd_ptr;
+}
+
+#else
+
+#ifdef CONFIG_ARM64
+#define DECLARE_GLOBAL_DATA_PTR                register volatile gd_t *gd asm ("x18")
+#else
+#define DECLARE_GLOBAL_DATA_PTR                register volatile gd_t *gd asm ("r9")
+#endif
+#endif
 
 #endif /* __ASM_GBL_DATA_H */