summaryrefslogtreecommitdiffstats
path: root/lib_mips
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-12-01 02:15:07 +0100
committerWolfgang Denk <wd@pollux.(none)>2005-12-01 02:15:07 +0100
commitc75eba3b4140187cd0d9bd8049f5df4c49b6889b (patch)
treea3ee0f61898fdac05b298b23e42b784d6fe0d5e1 /lib_mips
parent4a86d779ff0b2bf9690e50786dece5a689ba3345 (diff)
downloadu-boot-c75eba3b4140187cd0d9bd8049f5df4c49b6889b.tar.gz
u-boot-c75eba3b4140187cd0d9bd8049f5df4c49b6889b.tar.xz
u-boot-c75eba3b4140187cd0d9bd8049f5df4c49b6889b.zip
Fix U-Boot compilation for MIPS boards using ELDK 4.0
Diffstat (limited to 'lib_mips')
-rw-r--r--lib_mips/board.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/lib_mips/board.c b/lib_mips/board.c
index 839911be81..5dfdf90d6c 100644
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -29,6 +29,8 @@
#include <net.h>
#include <environment.h>
+DECLARE_GLOBAL_DATA_PTR;
+
#if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
(CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
defined(CFG_ENV_IS_IN_NVRAM)
@@ -66,8 +68,6 @@ static ulong mem_malloc_brk;
*/
static void mem_malloc_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
ulong dest_addr = CFG_MONITOR_BASE + gd->reloc_off;
mem_malloc_end = dest_addr;
@@ -94,8 +94,6 @@ void *sbrk (ptrdiff_t increment)
static int init_func_ram (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
#ifdef CONFIG_BOARD_TYPES
int board_type = gd->board_type;
#else
@@ -127,8 +125,6 @@ static void display_flash_config(ulong size)
static int init_baudrate (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
uchar tmp[64]; /* long enough for environment variables */
int i = getenv_r ("baudrate", tmp, sizeof (tmp));
@@ -180,12 +176,11 @@ init_fnc_t *init_sequence[] = {
void board_init_f(ulong bootflag)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd_t gd_data, *id;
bd_t *bd;
init_fnc_t **init_fnc_ptr;
ulong addr, addr_sp, len = (ulong)&uboot_end - CFG_MONITOR_BASE;
+ ulong *s;
#ifdef CONFIG_PURPLE
void copy_code (ulong);
#endif
@@ -262,8 +257,10 @@ void board_init_f(ulong bootflag)
*/
addr_sp -= 16;
addr_sp &= ~0xF;
- *((ulong *) addr_sp)-- = 0;
- *((ulong *) addr_sp)-- = 0;
+ s = (ulong *)addr_sp;
+ *s-- = 0;
+ *s-- = 0;
+ addr_sp = (ulong)s;
debug ("Stack Pointer at: %08lx\n", addr_sp);
/*
@@ -298,7 +295,6 @@ void board_init_f(ulong bootflag)
void board_init_r (gd_t *id, ulong dest_addr)
{
- DECLARE_GLOBAL_DATA_PTR;
cmd_tbl_t *cmdtp;
ulong size;
extern void malloc_bin_reloc (void);