Change initdram() return type to phys_size_t
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>
This commit is contained in:
parent
391fd93ab2
commit
9973e3c614
|
@ -39,7 +39,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
int size,i;
|
int size,i;
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
** ------
|
** ------
|
||||||
** int board_early_init_f(void)
|
** int board_early_init_f(void)
|
||||||
** int checkboard(void)
|
** int checkboard(void)
|
||||||
** long int initdram(int board_type)
|
** phys_size_t initdram(int board_type)
|
||||||
** called from 'board_init_f()' into 'common/board.c'
|
** called from 'board_init_f()' into 'common/board.c'
|
||||||
**
|
**
|
||||||
** void reset_phy(void)
|
** void reset_phy(void)
|
||||||
|
@ -179,7 +179,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -81,7 +81,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return articiaS_ram_init ();
|
return articiaS_ram_init ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1728,7 +1728,7 @@ long int dram_size (long int *base, long int maxsize)
|
||||||
|
|
||||||
/* ppcboot interface function to SDRAM init - this is where all the
|
/* ppcboot interface function to SDRAM init - this is where all the
|
||||||
* controlling logic happens */
|
* controlling logic happens */
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
int s0 = 0, s1 = 0;
|
int s0 = 0, s1 = 0;
|
||||||
int checkbank[4] = {[0 ... 3] = 0 };
|
int checkbank[4] = {[0 ... 3] = 0 };
|
||||||
|
|
|
@ -1737,7 +1737,7 @@ long int dram_size (long int *base, long int maxsize)
|
||||||
|
|
||||||
/* ppcboot interface function to SDRAM init - this is where all the
|
/* ppcboot interface function to SDRAM init - this is where all the
|
||||||
* controlling logic happens */
|
* controlling logic happens */
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
int s0 = 0, s1 = 0;
|
int s0 = 0, s1 = 0;
|
||||||
int checkbank[4] = {[0 ... 3] = 0 };
|
int checkbank[4] = {[0 ... 3] = 0 };
|
||||||
|
|
|
@ -165,7 +165,7 @@ void rpxclassic_init (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -102,7 +102,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -104,7 +104,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -110,7 +110,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -38,7 +38,7 @@ int checkboard (void)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
long size;
|
long size;
|
||||||
long new_bank0_end;
|
long new_bank0_end;
|
||||||
|
|
|
@ -65,7 +65,7 @@ static uint sdram_table[] = {
|
||||||
0xfffffc27, 0xfffffc04, 0xfffffc04, 0xfffffc04
|
0xfffffc27, 0xfffffc04, 0xfffffc04, 0xfffffc04
|
||||||
};
|
};
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
long int msize;
|
long int msize;
|
||||||
volatile immap_t *immap = (volatile immap_t *)CFG_IMMR;
|
volatile immap_t *immap = (volatile immap_t *)CFG_IMMR;
|
||||||
|
|
|
@ -112,7 +112,7 @@ int board_early_init_f (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
u32 msize = 0;
|
u32 msize = 0;
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ void setupBat (ulong size)
|
||||||
mtspr (DBAT7U, batu);
|
mtspr (DBAT7U, batu);
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong size;
|
ulong size;
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,7 @@ static void cram_bcr_write(u32 wr_val)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_NAND_SPL)
|
#if defined(CONFIG_NAND_SPL)
|
||||||
u32 reg;
|
u32 reg;
|
||||||
|
|
|
@ -453,7 +453,7 @@ int checkboard(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
#if !(defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL))
|
#if !(defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL))
|
||||||
long dram_size;
|
long dram_size;
|
||||||
|
|
|
@ -70,7 +70,7 @@ int checkboard(void)
|
||||||
initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
|
initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
|
||||||
the necessary info for SDRAM controller configuration
|
the necessary info for SDRAM controller configuration
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
long int ret;
|
long int ret;
|
||||||
|
|
||||||
|
|
|
@ -205,7 +205,7 @@ u32 ddr_clktr(u32 default_val) {
|
||||||
* I2C SPD DIMM autodetection/calibration doesn't fit into the 4k of boot
|
* I2C SPD DIMM autodetection/calibration doesn't fit into the 4k of boot
|
||||||
* code.
|
* code.
|
||||||
*/
|
*/
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
return CFG_MBYTES_SDRAM << 20;
|
return CFG_MBYTES_SDRAM << 20;
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,7 +104,7 @@ int checkboard(void)
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
long dram_size = 0;
|
long dram_size = 0;
|
||||||
|
|
||||||
|
|
|
@ -201,7 +201,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
long dram_size = 0;
|
long dram_size = 0;
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ extern void denali_core_search_data_eye(void);
|
||||||
* initdram -- 440EPx's DDR controller is a DENALI Core
|
* initdram -- 440EPx's DDR controller is a DENALI Core
|
||||||
*
|
*
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
#if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
|
||||||
#if !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_SPL)
|
||||||
|
|
|
@ -78,10 +78,10 @@ int checkboard(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
* long int initdram
|
* phys_size_t initdram
|
||||||
*
|
*
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
long int initdram(int board)
|
phys_size_t initdram(int board)
|
||||||
{
|
{
|
||||||
return CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS; /* 128Mbytes */
|
return CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS; /* 128Mbytes */
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,7 +89,7 @@ int checkboard(void)
|
||||||
* initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
|
* initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
|
||||||
* the necessary info for SDRAM controller configuration
|
* the necessary info for SDRAM controller configuration
|
||||||
*/
|
*/
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
return spd_sdram();
|
return spd_sdram();
|
||||||
}
|
}
|
||||||
|
|
|
@ -281,7 +281,7 @@ void sdram_tr1_set(int ram_address, int* tr1_value)
|
||||||
*tr1_value = (first_good + last_bad) / 2;
|
*tr1_value = (first_good + last_bad) / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board)
|
phys_size_t initdram(int board)
|
||||||
{
|
{
|
||||||
register uint reg;
|
register uint reg;
|
||||||
int tr1_bank1, tr1_bank2;
|
int tr1_bank1, tr1_bank2;
|
||||||
|
|
|
@ -133,7 +133,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
char *s = getenv ("dramsize");
|
char *s = getenv ("dramsize");
|
||||||
|
|
||||||
|
|
|
@ -340,7 +340,7 @@ int misc_init_r(void)
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8260_t *memctl = &immap->im_memctl;
|
volatile memctl8260_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -64,7 +64,7 @@ int board_early_init_f(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
unsigned long expected_size;
|
unsigned long expected_size;
|
||||||
unsigned long actual_size;
|
unsigned long actual_size;
|
||||||
|
|
|
@ -90,7 +90,7 @@ int board_early_init_f(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
unsigned long expected_size;
|
unsigned long expected_size;
|
||||||
unsigned long actual_size;
|
unsigned long actual_size;
|
||||||
|
|
|
@ -98,7 +98,7 @@ long int fixed_sdram (void)
|
||||||
}
|
}
|
||||||
#endif /* !defined(CONFIG_SPD_EEPROM) */
|
#endif /* !defined(CONFIG_SPD_EEPROM) */
|
||||||
|
|
||||||
long int
|
phys_size_t
|
||||||
initdram(int board_type)
|
initdram(int board_type)
|
||||||
{
|
{
|
||||||
long dram_size = 0;
|
long dram_size = 0;
|
||||||
|
|
|
@ -83,7 +83,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
long size;
|
long size;
|
||||||
long new_bank0_end;
|
long new_bank0_end;
|
||||||
|
|
|
@ -59,7 +59,7 @@ typedef struct SBootInfo {
|
||||||
|
|
||||||
/* barcohydra.c */
|
/* barcohydra.c */
|
||||||
int checkboard(void);
|
int checkboard(void);
|
||||||
long int initdram(int board_type);
|
phys_size_t initdram(int board_type);
|
||||||
void pci_init_board(void);
|
void pci_init_board(void);
|
||||||
void check_flash(void);
|
void check_flash(void);
|
||||||
int write_flash(char *addr, char value);
|
int write_flash(char *addr, char value);
|
||||||
|
|
|
@ -104,7 +104,7 @@ static void sdram_start (int hi_addr)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(CONFIG_MPC5200)
|
#if defined(CONFIG_MPC5200)
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
ulong dramsize2 = 0;
|
ulong dramsize2 = 0;
|
||||||
|
@ -205,7 +205,7 @@ long int initdram (int board_type)
|
||||||
|
|
||||||
#elif defined(CONFIG_MGT5100)
|
#elif defined(CONFIG_MGT5100)
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
#ifndef CFG_RAMBOOT
|
#ifndef CFG_RAMBOOT
|
||||||
|
|
|
@ -39,7 +39,7 @@ int checkboard(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
int brate;
|
int brate;
|
||||||
|
|
|
@ -48,7 +48,7 @@ int checkboard(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printf("SDRAM attributes:\n");
|
printf("SDRAM attributes:\n");
|
||||||
|
|
|
@ -97,7 +97,7 @@ void cf_outsw(unsigned short *addr, unsigned short *sect_buf, int words)
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_BFIN_IDE */
|
#endif /* CONFIG_BFIN_IDE */
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
int brate;
|
int brate;
|
||||||
|
|
|
@ -39,7 +39,7 @@ int checkboard(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
int brate;
|
int brate;
|
||||||
|
|
|
@ -51,7 +51,7 @@ int checkboard(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
return 64*1024*1024;
|
return 64*1024*1024;
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,7 +108,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -82,7 +82,7 @@ static void sdram_start (int hi_addr)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(CONFIG_MPC5200)
|
#if defined(CONFIG_MPC5200)
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
ulong dramsize2 = 0;
|
ulong dramsize2 = 0;
|
||||||
|
@ -185,7 +185,7 @@ long int initdram (int board_type)
|
||||||
|
|
||||||
#elif defined(CONFIG_MGT5100)
|
#elif defined(CONFIG_MGT5100)
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
#ifndef CFG_RAMBOOT
|
#ifndef CFG_RAMBOOT
|
||||||
|
|
|
@ -114,7 +114,7 @@ static mem_conf_t* get_mem_config(int board_type)
|
||||||
/*
|
/*
|
||||||
* Initalize SDRAM - configure SDRAM controller, detect memory size.
|
* Initalize SDRAM - configure SDRAM controller, detect memory size.
|
||||||
*/
|
*/
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
#ifndef CFG_RAMBOOT
|
#ifndef CFG_RAMBOOT
|
||||||
|
|
|
@ -62,7 +62,7 @@ int checkboard(void)
|
||||||
/*
|
/*
|
||||||
* Get RAM size.
|
* Get RAM size.
|
||||||
*/
|
*/
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
return (SRAM_SIZE); /* We currently have a static size adapted for cmi board. */
|
return (SRAM_SIZE); /* We currently have a static size adapted for cmi board. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile sdramctrl_t *sdp = (sdramctrl_t *) (MMAP_SDRAM);
|
volatile sdramctrl_t *sdp = (sdramctrl_t *) (MMAP_SDRAM);
|
||||||
|
|
||||||
|
|
|
@ -233,7 +233,7 @@ int misc_init_f (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_CMA111
|
#ifdef CONFIG_CMA111
|
||||||
return (32L * 1024L * 1024L);
|
return (32L * 1024L * 1024L);
|
||||||
|
|
|
@ -61,7 +61,7 @@ int checkboard(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
int m, row, col, bank, i, ref;
|
int m, row, col, bank, i, ref;
|
||||||
unsigned long start, end;
|
unsigned long start, end;
|
||||||
|
|
|
@ -273,7 +273,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
|
||||||
return (size);
|
return (size);
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8260_t *memctl = &immap->im_memctl;
|
volatile memctl8260_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -274,7 +274,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
|
||||||
return (size);
|
return (size);
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8260_t *memctl = &immap->im_memctl;
|
volatile memctl8260_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -170,7 +170,7 @@ int misc_init_r (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (L1_MEMSIZE);
|
return (L1_MEMSIZE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,7 +120,7 @@ int checkboard(void)
|
||||||
* configured by initialization code
|
* configured by initialization code
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
long initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong tot_size;
|
ulong tot_size;
|
||||||
ulong bank_size;
|
ulong bank_size;
|
||||||
|
|
|
@ -88,7 +88,7 @@ int checkboard(void)
|
||||||
* configured by initialization code
|
* configured by initialization code
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
long initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong tot_size;
|
ulong tot_size;
|
||||||
ulong bank_size;
|
ulong bank_size;
|
||||||
|
|
|
@ -45,7 +45,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
long size;
|
long size;
|
||||||
long new_bank0_end;
|
long new_bank0_end;
|
||||||
|
|
|
@ -203,7 +203,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <asm/mipsregs.h>
|
#include <asm/mipsregs.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
/* Sdram is setup by assembler code */
|
/* Sdram is setup by assembler code */
|
||||||
/* If memory could be changed, we should return the true value here */
|
/* If memory could be changed, we should return the true value here */
|
||||||
|
|
|
@ -52,7 +52,7 @@ int checkflash (void)
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
int i, cnt;
|
int i, cnt;
|
||||||
volatile uchar *base = CFG_SDRAM_BASE;
|
volatile uchar *base = CFG_SDRAM_BASE;
|
||||||
|
|
|
@ -162,7 +162,7 @@ long int dram_size (int board_type)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return dram_size (board_type);
|
return dram_size (board_type);
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,7 +104,7 @@ long int dram_size (int board_type)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return dram_size (board_type);
|
return dram_size (board_type);
|
||||||
}
|
}
|
||||||
|
|
|
@ -251,7 +251,7 @@ int misc_init_r (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
* initialize SDRAM/DDRAM controller.
|
* initialize SDRAM/DDRAM controller.
|
||||||
* TBD: get data from I2C EEPROM
|
* TBD: get data from I2C EEPROM
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
#ifndef CFG_RAMBOOT
|
#ifndef CFG_RAMBOOT
|
||||||
|
|
|
@ -76,7 +76,7 @@ int checkboard (void)
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Initialize DRAM controller
|
* Initialize DRAM controller
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -208,7 +208,7 @@ int board_early_init_f (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
vu_char *bcsr = (vu_char *)CFG_BCSR;
|
vu_char *bcsr = (vu_char *)CFG_BCSR;
|
||||||
long int msize = 16L << (bcsr[2] & 3);
|
long int msize = 16L << (bcsr[2] & 3);
|
||||||
|
|
|
@ -243,7 +243,7 @@ int checkboard (void)
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8260_t *memctl = &immap->im_memctl;
|
volatile memctl8260_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -219,7 +219,7 @@ int board_early_init_f (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
/* Size in MB of SDRAM populated on board*/
|
/* Size in MB of SDRAM populated on board*/
|
||||||
long int msize = 256;
|
long int msize = 256;
|
||||||
|
|
|
@ -86,7 +86,7 @@ int board_early_init_f (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
long int msize;
|
long int msize;
|
||||||
volatile immap_t *immap = (volatile immap_t *)CFG_IMMR;
|
volatile immap_t *immap = (volatile immap_t *)CFG_IMMR;
|
||||||
|
|
|
@ -121,7 +121,7 @@ int checkboard (void)
|
||||||
*/
|
*/
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
#ifndef CONFIG_ERIC
|
#ifndef CONFIG_ERIC
|
||||||
int i;
|
int i;
|
||||||
|
|
|
@ -79,7 +79,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (16 * 1024 * 1024);
|
return (16 * 1024 * 1024);
|
||||||
}
|
}
|
||||||
|
|
|
@ -423,7 +423,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -207,7 +207,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -141,7 +141,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -495,7 +495,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ static void sdram_start(int hi_addr)
|
||||||
* is something else than 0x00000000.
|
* is something else than 0x00000000.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
ulong test1, test2;
|
ulong test1, test2;
|
||||||
|
|
|
@ -1602,7 +1602,7 @@ dram_size(long int *base, long int maxsize)
|
||||||
|
|
||||||
/* ppcboot interface function to SDRAM init - this is where all the
|
/* ppcboot interface function to SDRAM init - this is where all the
|
||||||
* controlling logic happens */
|
* controlling logic happens */
|
||||||
long int
|
phys_size_t
|
||||||
initdram(int board_type)
|
initdram(int board_type)
|
||||||
{
|
{
|
||||||
int s0 = 0, s1 = 0;
|
int s0 = 0, s1 = 0;
|
||||||
|
|
|
@ -186,7 +186,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (16 * 1024 * 1024);
|
return (16 * 1024 * 1024);
|
||||||
}
|
}
|
||||||
|
|
|
@ -206,7 +206,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (16 * 1024 * 1024);
|
return (16 * 1024 * 1024);
|
||||||
}
|
}
|
||||||
|
|
|
@ -122,7 +122,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -200,7 +200,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
return (16 * 1024 * 1024);
|
return (16 * 1024 * 1024);
|
||||||
}
|
}
|
||||||
|
|
|
@ -644,7 +644,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -229,7 +229,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ static void sdram_start(int hi_addr)
|
||||||
* is something else than 0x00000000.
|
* is something else than 0x00000000.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
ulong test1, test2;
|
ulong test1, test2;
|
||||||
|
|
|
@ -101,7 +101,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -358,7 +358,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ static void sdram_start(int hi_addr)
|
||||||
* is something else than 0x00000000.
|
* is something else than 0x00000000.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
ulong dramsize = 0;
|
ulong dramsize = 0;
|
||||||
ulong test1, test2;
|
ulong test1, test2;
|
||||||
|
|
|
@ -232,7 +232,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -157,7 +157,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ extern void denali_core_search_data_eye(void);
|
||||||
* initdram -- 440EPx's DDR controller is a DENALI Core
|
* initdram -- 440EPx's DDR controller is a DENALI Core
|
||||||
*
|
*
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
#if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
|
||||||
#if !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_SPL)
|
||||||
|
|
|
@ -77,7 +77,7 @@ int checkboard (void) {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type) {
|
phys_size_t initdram (int board_type) {
|
||||||
unsigned long junk = 0xa5a59696;
|
unsigned long junk = 0xa5a59696;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -305,7 +305,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -205,7 +205,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ int checkboard (void)
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -53,7 +53,7 @@ int checkflash (void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
int m, row, col, bank, i;
|
int m, row, col, bank, i;
|
||||||
unsigned long start, end;
|
unsigned long start, end;
|
||||||
|
|
|
@ -93,7 +93,7 @@ unsigned long setdram(int m, int row, int col, int bank)
|
||||||
return (1 << (col + row + 3) ) * bank * m;
|
return (1 << (col + row + 3) ) * bank * m;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram(int board_type)
|
phys_size_t initdram(int board_type)
|
||||||
{
|
{
|
||||||
unsigned int msr;
|
unsigned int msr;
|
||||||
long int size = 0;
|
long int size = 0;
|
||||||
|
|
|
@ -125,7 +125,7 @@ int checkboard (void)
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
volatile immap_t *immap = (immap_t *) CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
|
@ -524,7 +524,7 @@ static long int dram_size (long int *base, long int maxsize)
|
||||||
|
|
||||||
/* U-Boot interface function to SDRAM init - this is where all the
|
/* U-Boot interface function to SDRAM init - this is where all the
|
||||||
* controlling logic happens */
|
* controlling logic happens */
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
ulong checkbank[4] = {[0 ... 3] = 0 };
|
ulong checkbank[4] = {[0 ... 3] = 0 };
|
||||||
int bank_no;
|
int bank_no;
|
||||||
|
|
|
@ -71,7 +71,7 @@ int checkboard (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************ */
|
/* ************************************************************************ */
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
/* ------------------------------------------------------------------------ --
|
/* ------------------------------------------------------------------------ --
|
||||||
* Purpose : Determines size of mounted DRAM.
|
* Purpose : Determines size of mounted DRAM.
|
||||||
* Remarks : Size is determined by reading SDRAM configuration registers as
|
* Remarks : Size is determined by reading SDRAM configuration registers as
|
||||||
|
|
|
@ -600,7 +600,7 @@ static int initsdram(uint base, uint *noMbytes)
|
||||||
|
|
||||||
/* ========================================================================= */
|
/* ========================================================================= */
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
uint sdramsz = 0; /* size of sdram in Mbytes */
|
uint sdramsz = 0; /* size of sdram in Mbytes */
|
||||||
uint base = 0; /* base of dram in bytes */
|
uint base = 0; /* base of dram in bytes */
|
||||||
|
|
|
@ -96,7 +96,7 @@ int checkboard (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
long int initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue