diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-28 20:34:39 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-28 20:34:39 +0200 |
| commit | bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc (patch) | |
| tree | 8c0d3886a19dfd82551588928b448198ac5274ce /arch/nios2/include/asm/global_data.h | |
| parent | 35269d3fca60b5f73113b0443c8e40070749c1d9 (diff) | |
| parent | 1117cbf2adac59050af1751af6c6a524afa5c3ef (diff) | |
| download | olio-uboot-2014.01-bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc.tar.xz olio-uboot-2014.01-bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc.zip | |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'arch/nios2/include/asm/global_data.h')
| -rw-r--r-- | arch/nios2/include/asm/global_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h index 34aa96277..f1b348293 100644 --- a/arch/nios2/include/asm/global_data.h +++ b/arch/nios2/include/asm/global_data.h @@ -48,6 +48,6 @@ typedef struct global_data { #define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ #define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("r15") +#define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("gp") #endif /* __ASM_NIOS2_GLOBALDATA_H_ */ |