diff options
| author | David Feng <fenghua@phytium.com.cn> | 2013-12-14 11:47:35 +0800 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-09 16:08:44 +0100 |
| commit | 0ae7653128c80a4f2920cbe9b124792c2fd9d9e0 (patch) | |
| tree | 14fea7a80e4ea84c7b6a3bc32298daeec55054c7 /arch/arm/include/asm/global_data.h | |
| parent | 54799e4596bf8af33fd4a8dee153be7011c06d8d (diff) | |
| download | talos-obmc-uboot-0ae7653128c80a4f2920cbe9b124792c2fd9d9e0.tar.gz talos-obmc-uboot-0ae7653128c80a4f2920cbe9b124792c2fd9d9e0.zip | |
arm64: core support
Relocation code based on a patch by Scott Wood, which is:
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: David Feng <fenghua@phytium.com.cn>
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index e126436093..60e872637f 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -47,6 +47,10 @@ struct arch_global_data { #include <asm-generic/global_data.h> -#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r9") +#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 /* __ASM_GBL_DATA_H */ |
