diff options
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/asmmacro.h | 4 | ||||
| -rw-r--r-- | include/asm-sparc/global_data.h | 3 | ||||
| -rw-r--r-- | include/asm-sparc/io.h | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/asm-sparc/asmmacro.h b/include/asm-sparc/asmmacro.h index 0c4cefdf4..aeb87ee7d 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 a8d85f1b5..dea285727 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 { @@ -82,6 +82,7 @@ typedef struct global_data { #define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ #define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ #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 volatile gd_t *gd asm ("%g7") diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index ede0b1a8d..0c5d86cb3 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)) @@ -90,4 +90,9 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags) } +static inline phys_addr_t virt_to_phys(void * vaddr) +{ + return (phys_addr_t)(vaddr); +} + #endif |