diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /include/asm-sparc | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.bz2 | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/asmmacro.h | 4 | ||||
| -rw-r--r-- | include/asm-sparc/global_data.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/io.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-sparc/asmmacro.h b/include/asm-sparc/asmmacro.h index 0c4cefd..aeb87ee 100644 --- a/include/asm-sparc/asmmacro.h +++ b/include/asm-sparc/asmmacro.h @@ -33,8 +33,8 @@ * c-code can be called. */ #define SAVE_ALL_HEAD \ - sethi %hi(trap_setup+(CFG_RELOC_MONITOR_BASE-TEXT_BASE)), %l4; \ - jmpl %l4 + %lo(trap_setup+(CFG_RELOC_MONITOR_BASE-TEXT_BASE)), %l6; + sethi %hi(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)), %l4; \ + jmpl %l4 + %lo(trap_setup+(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)), %l6; #define SAVE_ALL \ SAVE_ALL_HEAD \ nop; diff --git a/include/asm-sparc/global_data.h b/include/asm-sparc/global_data.h index eeb35d0..dea2857 100644 --- a/include/asm-sparc/global_data.h +++ b/include/asm-sparc/global_data.h @@ -36,7 +36,7 @@ * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). * - * Keep it *SMALL* and remember to set CFG_GBL_DATA_SIZE > sizeof(gd_t) + * Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index ede0b1a..5f8d05c 100644 --- a/include/asm-sparc/io.h +++ b/include/asm-sparc/io.h @@ -32,7 +32,7 @@ * over and over again resulting in a hang (until an IRQ if lucky) * */ -#ifndef CFG_HAS_NO_CACHE +#ifndef CONFIG_SYS_HAS_NO_CACHE #define READ_BYTE(var) SPARC_NOCACHE_READ_BYTE((unsigned int)(var)) #define READ_HWORD(var) SPARC_NOCACHE_READ_HWORD((unsigned int)(var)) #define READ_WORD(var) SPARC_NOCACHE_READ((unsigned int)(var)) |