Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The new zlib uses HEAP_SIZE, so instead use BOARD_HEAP_SIZE as the

Browse Source 
symbol to use here.  Also adapt to the new zlib with the changed name
for the header file.
This commit is contained in:
he 2006-01-16 19:34:53 +00:00
parent 91ce49cce6
commit b1bcd0ffae
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/evbarm/stand/board/becc_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: becc_mem.c,v 1.2 2005/12/24 20:07:03 perry Exp $ */
/* $NetBSD: becc_mem.c,v 1.3 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@ -90,7 +90,7 @@ mem_init(void)
}
#endif
heap = (start + size) - HEAP_SIZE;
heap = (start + size) - BOARD_HEAP_SIZE;
printf(">> RAM 0x%x - 0x%x, heap at 0x%x\n",
start, (start + size) - 1, heap);

4
sys/arch/evbarm/stand/board/i80312_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i80312_mem.c,v 1.3 2005/12/24 20:07:03 perry Exp $ */
/* $NetBSD: i80312_mem.c,v 1.4 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@ -73,7 +73,7 @@ mem_init(void)
size = bank0 + bank1;
heap = (start + size) - HEAP_SIZE;
heap = (start + size) - BOARD_HEAP_SIZE;
printf(">> RAM 0x%x - 0x%x, heap at 0x%x\n",
start, (start + size) - 1, heap);

4
sys/arch/evbarm/stand/board/i80321_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i80321_mem.c,v 1.3 2005/12/24 20:07:03 perry Exp $ */
/* $NetBSD: i80321_mem.c,v 1.4 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@ -73,7 +73,7 @@ mem_init(void)
size = bank0 + bank1;
heap = (start + size) - HEAP_SIZE;
heap = (start + size) - BOARD_HEAP_SIZE;
printf(">> RAM 0x%x - 0x%x, heap at 0x%x\n",
start, (start + size) - 1, heap);

4
sys/arch/evbarm/stand/board/integrator_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: integrator_mem.c,v 1.3 2005/12/24 20:07:03 perry Exp $ */
/* $NetBSD: integrator_mem.c,v 1.4 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@ -83,7 +83,7 @@ mem_init(void)
}
/* Start is always 0. */
heap = size - HEAP_SIZE;
heap = size - BOARD_HEAP_SIZE;
printf(">> RAM 0x%x - 0x%x, heap at 0x%x\n", 0, size - 1, heap);
setheap((void *)heap, (void *)(size - 1));

6
sys/arch/evbarm/stand/board/smdk2410.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smdk2410.c,v 1.3 2005/12/11 12:17:09 christos Exp $ */
/* $NetBSD: smdk2410.c,v 1.4 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2003 By Noon Software, Inc. All rights reserved.
@ -57,9 +57,9 @@ mem_init(void)
start = S3C2410_SDRAM_START;
size = SDRAM_SIZE;
heap = (start + size) - HEAP_SIZE;
heap = (start + size) - BOARD_HEAP_SIZE;
printf(">> RAM 0x%x - 0x%x, heap at 0x%x\n",
start, (start + size) - 1, heap);
setheap((void *)heap, (void *)(heap + HEAP_SIZE - 1));
setheap((void *)heap, (void *)(heap + BOARD_HEAP_SIZE - 1));
}

6
sys/arch/evbarm/stand/board/smdk2800.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smdk2800.c,v 1.4 2005/12/11 12:17:09 christos Exp $ */
/* $NetBSD: smdk2800.c,v 1.5 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@ -68,11 +68,11 @@ mem_init(void)
/* ROM monitor uses top of SDRAM for page table. */
#define ROMMONITOR_PAGETABLE (RAM_START+RAM_SIZE-0x8000)
heap = ROMMONITOR_PAGETABLE - HEAP_SIZE;
heap = ROMMONITOR_PAGETABLE - BOARD_HEAP_SIZE;
printf(">> RAM 0x%x - 0x%x, heap at 0x%x\n",
start, (start + size) - 1, heap);
setheap((void *)heap, (void *)(heap + HEAP_SIZE - 1));
setheap((void *)heap, (void *)(heap + BOARD_HEAP_SIZE - 1));
}
#ifdef SELFCOPY_TO_FLASH

4
sys/arch/evbarm/stand/board/ts7200.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ts7200.c,v 1.2 2005/12/11 12:17:09 christos Exp $ */
/* $NetBSD: ts7200.c,v 1.3 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@ -46,7 +46,7 @@ void
board_init(void)
{
/* There is guaranteed to be at least a 8MB chunk of SDRAM at 0x0*/
void *heap = (void *)(0x800000 - HEAP_SIZE);
void *heap = (void *)(0x800000 - BOARD_HEAP_SIZE);
setheap(heap, (void *)(0x800000 - 1));
}

4
sys/arch/evbarm/stand/gzboot/Makefile.gzboot
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.gzboot,v 1.13 2005/12/11 12:17:10 christos Exp $
# $NetBSD: Makefile.gzboot,v 1.14 2006/01/16 19:34:53 he Exp $
NOMAN= # defined
@ -38,7 +38,7 @@ CPPFLAGS+= -I${S} -I${S}/arch -I${S}/lib/libsa
CPPFLAGS+= -D_STANDALONE
# Specify the heap size (used by board mem_init() routines)
CPPFLAGS+= -DHEAP_SIZE=1048576 # 1M
CPPFLAGS+= -DBOARD_HEAP_SIZE=1048576 # 1M
# libsa options
CPPFLAGS+= -DHEAP_VARIABLE

4
sys/arch/evbarm/stand/gzboot/gzboot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gzboot.c,v 1.9 2005/12/11 12:17:10 christos Exp $ */
/* $NetBSD: gzboot.c,v 1.10 2006/01/16 19:34:53 he Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@ -66,7 +66,7 @@
#include <sys/param.h>
#include <lib/libsa/stand.h>
#include <lib/libkern/libkern.h>
#include <lib/libz/zlib.h>
#include <lib/libz/libz.h>
#include "board.h"
#include "gzboot.h"