mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-18 18:59:44 +00:00
9973e3c614
This patch changes the return type of initdram() from long int to phys_size_t. This is required for a couple of reasons: long int limits the amount of dram to 2GB, and u-boot in general is moving over to phys_size_t to represent the size of physical memory. phys_size_t is defined as an unsigned long on almost all current platforms. This patch *only* changes the return type of the initdram function (in include/common.h, as well as in each board's implementation of initdram). It does not actually modify the code inside the function on any of the platforms; platforms which wish to support more than 2GB of DRAM will need to modify their initdram() function code. Build tested with MAKEALL for ppc, arm, mips, mips-el. Booted on powerpc MPC8641HPCN. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
93 lines
2.7 KiB
C
93 lines
2.7 KiB
C
/*
|
|
* (C) Copyright 2001
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <config.h>
|
|
#include <mpc8xx.h>
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
#define _NOT_USED_ 0xFFFFFFFF
|
|
|
|
const uint edo_60ns[] =
|
|
{ 0x8ffbec24, 0x0ff3ec04, 0x0cf3ec04, 0x00f3ec04,
|
|
0x00f3ec00, 0x37f7ec47, _NOT_USED_, _NOT_USED_,
|
|
0x8fffec24, 0x0ffbec04, 0x08f3ec04, 0x07f3ec08,
|
|
0x08f3ec04, 0x07f3ec48, 0x08f3ec04, 0x07f3ec48,
|
|
0x08f3ec04, 0x07f3ec48, 0x1ff7ec47, _NOT_USED_,
|
|
_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
|
|
0x8fffcc24, 0x0fefcc04, 0x0cafcc00, 0x11bfcc47,
|
|
_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
|
|
0x8fffcc24, 0x0fefcc04, 0x0cafcc00, 0x03afcc4c,
|
|
0x0cafcc00, 0x03afcc4c, 0x0cafcc00, 0x03afcc4c,
|
|
0x0cafcc00, 0x33bfcc4f, _NOT_USED_, _NOT_USED_,
|
|
_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
|
|
0xc0ffcc84, 0x00ffcc04, 0x07ffcc04, 0x3fffcc06,
|
|
0xffffcc85, 0xffffcc05, _NOT_USED_, _NOT_USED_,
|
|
_NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_,
|
|
0x33ffcc07, _NOT_USED_, _NOT_USED_, _NOT_USED_ };
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/*
|
|
* Check Board Identity:
|
|
*/
|
|
|
|
int checkboard (void)
|
|
{
|
|
puts ("Board: AMX860\n");
|
|
return 0;
|
|
}
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
phys_size_t initdram (int board_type)
|
|
{
|
|
|
|
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
|
|
|
/* AMX860: has 4 Mb of 60ns EDO DRAM, so start DRAM at 0 */
|
|
|
|
upmconfig(UPMA, (uint *) edo_60ns, sizeof(edo_60ns)/sizeof(uint));
|
|
|
|
#ifndef CONFIG_AMX_RAM_EXT
|
|
memctl->memc_mptpr = 0x0400; /* divide by 16 */
|
|
#else
|
|
memctl->memc_mptpr = 0x0200;
|
|
#endif
|
|
|
|
memctl->memc_mamr = 0x30a21114;
|
|
memctl->memc_or2 = 0xffc00800;
|
|
#ifndef CONFIG_AMX_RAM_EXT
|
|
memctl->memc_br2 = 0x81;
|
|
|
|
return (4 << 20);
|
|
#else
|
|
memctl->memc_or1 = 0xff000800;
|
|
memctl->memc_br1 = 0x00000081;
|
|
memctl->memc_br2 = 0x01000081;
|
|
|
|
return (20 << 20);
|
|
#endif
|
|
}
|