From d143924a89917f68b59ecdaacd8e08bf85cf220a Mon Sep 17 00:00:00 2001
From: Oliver Schinagl <oliver@schinagl.nl>
Date: Mon, 7 Oct 2013 12:25:15 +0200
Subject: [PATCH u-boot (sc) 2/3] Update all references to get_ram_size to
unsigned long
With the recent change to use unsigned longs over longs for get_ram_size
all references have to be updated. Since the old behavior was broken to
begin with, changes are kept as close to begin with for boards. For
boards where there where no consequences and could be safely converted
from long to unsigned long, those have been changed.
Signed-off-by: Oliver Schinagl <oliver@schinagl.nl>
---
arch/arm/cpu/arm926ejs/davinci/misc.c | 2 +-
arch/arm/cpu/arm926ejs/kirkwood/dram.c | 2 +-
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 2 +-
arch/arm/cpu/arm926ejs/orion5x/dram.c | 2 +-
arch/arm/cpu/armv7/am33xx/emif4.c | 2 +-
arch/arm/cpu/armv7/omap-common/emif-common.c | 4 ++--
arch/arm/cpu/armv7/socfpga/misc.c | 2 +-
arch/powerpc/cpu/mpc512x/fixed_sdram.c | 2 +-
arch/powerpc/cpu/ppc4xx/sdram.c | 8 ++++----
board/AndesTech/adp-ag101/adp-ag101.c | 2 +-
board/AndesTech/adp-ag101p/adp-ag101p.c | 2 +-
board/AndesTech/adp-ag102/adp-ag102.c | 2 +-
board/BuS/eb_cpux9k2/cpux9k2.c | 2 +-
board/BuS/vl_ma2sc/vl_ma2sc.c | 2 +-
board/CarMediaLab/flea3/flea3.c | 2 +-
board/LEOX/elpt860/elpt860.c | 2 +-
board/RPXClassic/RPXClassic.c | 2 +-
board/RPXlite/RPXlite.c | 2 +-
board/RPXlite_dw/RPXlite_dw.c | 2 +-
board/RRvision/RRvision.c | 2 +-
board/a3000/a3000.c | 8 ++++----
board/a3m071/a3m071.c | 4 ++--
board/a4m072/a4m072.c | 4 ++--
board/adder/adder.c | 2 +-
board/afeb9260/afeb9260.c | 2 +-
board/armltd/integrator/integrator.c | 4 ++--
board/armltd/versatile/versatile.c | 2 +-
board/armltd/vexpress/vexpress_common.c | 6 +++---
board/atc/atc.c | 2 +-
board/atmel/at91rm9200ek/at91rm9200ek.c | 2 +-
board/atmel/at91sam9260ek/at91sam9260ek.c | 2 +-
board/atmel/at91sam9261ek/at91sam9261ek.c | 2 +-
board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +-
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +-
board/atmel/at91sam9n12ek/at91sam9n12ek.c | 2 +-
board/atmel/at91sam9rlek/at91sam9rlek.c | 2 +-
board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 +-
board/atmel/atngw100/atngw100.c | 2 +-
board/atmel/atngw100mkii/atngw100mkii.c | 2 +-
board/atmel/atstk1000/atstk1000.c | 2 +-
board/atmel/sama5d3xek/sama5d3xek.c | 2 +-
board/bc3450/bc3450.c | 8 ++++----
board/bluewater/snapper9260/snapper9260.c | 2 +-
board/calao/sbc35_a9g20/sbc35_a9g20.c | 2 +-
board/calao/tny_a9260/tny_a9260.c | 2 +-
board/canmb/canmb.c | 8 ++++----
board/cm5200/cm5200.c | 4 ++--
board/congatec/cgtqmx6eval/cgtqmx6eval.c | 2 +-
board/cpu86/cpu86.c | 2 +-
board/cpu87/cpu87.c | 2 +-
board/cu824/cu824.c | 8 ++++----
board/davedenx/qong/qong.c | 2 +-
board/denx/m53evk/m53evk.c | 6 +++---
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 2 +-
board/egnite/ethernut5/ethernut5.c | 2 +-
board/emk/top9000/top9000.c | 2 +-
board/ep88x/ep88x.c | 2 +-
board/esd/cpci5200/cpci5200.c | 4 ++--
board/esd/mecp5123/mecp5123.c | 2 +-
board/esd/meesc/meesc.c | 2 +-
board/esd/otc570/otc570.c | 2 +-
board/esd/pf5200/pf5200.c | 4 ++--
board/esd/vme8349/vme8349.c | 2 +-
board/esg/ima3-mx53/ima3-mx53.c | 2 +-
board/esteem192e/esteem192e.c | 4 ++--
board/eukrea/cpu9260/cpu9260.c | 2 +-
board/eukrea/cpuat91/cpuat91.c | 2 +-
board/fads/fads.c | 2 +-
board/faraday/a320evb/a320evb.c | 2 +-
board/freescale/mpc8308rdb/sdram.c | 2 +-
board/freescale/mx25pdk/mx25pdk.c | 2 +-
board/freescale/mx31ads/mx31ads.c | 2 +-
board/freescale/mx31pdk/mx31pdk.c | 2 +-
board/freescale/mx35pdk/mx35pdk.c | 6 +++---
board/freescale/mx51evk/mx51evk.c | 2 +-
board/freescale/mx53ard/mx53ard.c | 6 +++---
board/freescale/mx53evk/mx53evk.c | 2 +-
board/freescale/mx53loco/mx53loco.c | 6 +++---
board/freescale/mx53smd/mx53smd.c | 6 +++---
board/freescale/mx6qarm2/mx6qarm2.c | 2 +-
board/freescale/mx6qsabreauto/mx6qsabreauto.c | 2 +-
board/freescale/mx6sabresd/mx6sabresd.c | 2 +-
board/freescale/mx6slevk/mx6slevk.c | 2 +-
board/freescale/titanium/titanium.c | 2 +-
board/freescale/vf610twr/vf610twr.c | 2 +-
board/friendlyarm/mini2440/mini2440.c | 2 +-
board/galaxy5200/galaxy5200.c | 4 ++--
board/genesi/mx51_efikamx/efikamx.c | 2 +-
board/genietv/genietv.c | 6 +++---
board/hale/tt01/tt01.c | 2 +-
board/hermes/hermes.c | 3 ++-
board/hidden_dragon/hidden_dragon.c | 8 ++++----
board/icecube/icecube.c | 8 ++++----
board/icpdas/lp8x4x/lp8x4x.c | 2 +-
board/icu862/icu862.c | 2 +-
board/ids8247/ids8247.c | 4 ++--
board/ifm/o2dnt2/o2dnt2.c | 8 ++++----
board/imx31_phycore/imx31_phycore.c | 2 +-
board/in-circuit/grasshopper/grasshopper.c | 2 +-
board/incaip/incaip.c | 2 +-
board/inka4x0/inka4x0.c | 6 +++---
board/intercontrol/digsy_mtc/digsy_mtc.c | 6 +++---
board/ip860/ip860.c | 3 ++-
board/ipek01/ipek01.c | 4 ++--
board/iphase4539/iphase4539.c | 2 +-
board/ispan/ispan.c | 2 +-
board/ivm/ivm.c | 3 ++-
board/jupiter/jupiter.c | 8 ++++----
board/karo/tx25/tx25.c | 6 +++---
board/keymile/km82xx/km82xx.c | 2 +-
board/logicpd/imx27lite/imx27lite.c | 6 +++---
board/logicpd/imx31_litekit/imx31_litekit.c | 2 +-
board/lwmon/lwmon.c | 2 +-
board/manroland/hmi1001/hmi1001.c | 4 ++--
board/manroland/mucmc52/mucmc52.c | 8 ++++----
board/manroland/uc101/uc101.c | 4 ++--
board/matrix_vision/mvbc_p/mvbc_p.c | 4 ++--
board/matrix_vision/mvsmr/mvsmr.c | 4 ++--
board/mcc200/mcc200.c | 8 ++++----
board/micronas/vct/vct.c | 2 +-
board/mimc/mimc200/mimc200.c | 2 +-
board/miromico/hammerhead/hammerhead.c | 2 +-
board/motionpro/motionpro.c | 4 ++--
board/muas3001/muas3001.c | 2 +-
board/munices/munices.c | 4 ++--
board/musenki/musenki.c | 8 ++++----
board/mvblue/mvblue.c | 8 ++++----
board/mx1ads/mx1ads.c | 2 +-
board/netphone/netphone.c | 2 +-
board/netta/netta.c | 2 +-
board/netta2/netta2.c | 2 +-
board/nx823/nx823.c | 3 ++-
board/phytec/pcm030/pcm030.c | 4 ++--
board/pm520/pm520.c | 8 ++++----
board/pm826/pm826.c | 2 +-
board/pn62/pn62.c | 8 ++++----
board/r360mpi/r360mpi.c | 2 +-
board/rbc823/rbc823.c | 3 ++-
board/ronetix/pm9261/pm9261.c | 2 +-
board/ronetix/pm9263/pm9263.c | 2 +-
board/ronetix/pm9g45/pm9g45.c | 2 +-
board/samsung/arndale/arndale.c | 4 ++--
board/samsung/origen/origen.c | 20 ++++++++++++--------
board/samsung/smdk5250/exynos5-dt.c | 8 ++++----
board/samsung/smdk5250/smdk5250.c | 8 ++++----
board/samsung/smdkc100/smdkc100.c | 2 +-
board/samsung/smdkv310/smdkv310.c | 20 ++++++++++++--------
board/samsung/trats/trats.c | 12 ++++++++----
board/samsung/universal_c210/universal.c | 6 ++++--
board/sandpoint/sandpoint.c | 8 ++++----
board/scb9328/scb9328.c | 2 +-
board/snmc/qs850/qs850.c | 2 +-
board/snmc/qs860t/qs860t.c | 2 +-
board/socrates/sdram.c | 2 +-
board/spc1920/spc1920.c | 2 +-
board/spd8xx/spd8xx.c | 2 +-
board/stx/stxxtc/stxxtc.c | 4 ++--
board/syteco/jadecpu/jadecpu.c | 2 +-
board/syteco/zmx25/zmx25.c | 2 +-
board/taskit/stamp9g20/stamp9g20.c | 2 +-
board/ti/omap5912osk/omap5912osk.c | 2 +-
board/timll/devkit3250/devkit3250.c | 2 +-
board/total5200/sdram.c | 8 ++++----
board/tqc/tqm5200/tqm5200.c | 8 ++++----
board/tqc/tqm8260/tqm8260.c | 4 ++--
board/tqc/tqm8272/tqm8272.c | 4 ++--
board/tqc/tqm834x/tqm834x.c | 2 +-
board/tqc/tqm8xx/tqm8xx.c | 2 +-
board/ttcontrol/vision2/vision2.c | 2 +-
board/utx8245/utx8245.c | 10 +++++-----
board/v38b/v38b.c | 8 ++++----
board/ve8313/ve8313.c | 2 +-
board/woodburn/woodburn.c | 2 +-
post/board/lwmon5/fpga.c | 2 +-
post/board/lwmon5/gdc.c | 2 +-
175 files changed, 323 insertions(+), 304 deletions(-)
@@ -23,7 +23,7 @@ int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_MAX_RAM_BANK_SIZE);
return 0;
}
@@ -86,7 +86,7 @@ void kw_sdram_size_adjust(enum memory_bank bank)
u32 size;
/* probe currently equipped RAM size */
- size = get_ram_size((void *)kw_sdram_bar(bank), kw_sdram_bs(bank));
+ size = (u32)get_ram_size((unsigned long *)kw_sdram_bar(bank), (unsigned long)kw_sdram_bs(bank));
/* adjust SDRAM window size accordingly */
kw_sdram_bs_set(bank, size);
@@ -226,7 +226,7 @@ uint32_t mxs_mem_get_size(void)
da = vt[4];
vt[4] = data_abort_memdetect_handler;
- sz = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ sz = (uint32_t)get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
/* Restore the old DABT handler. */
vt[4] = da;
@@ -37,7 +37,7 @@ int dram_init (void)
{
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size(
- (long *) orion5x_sdram_bar(0),
+ (unsigned long *) orion5x_sdram_bar(0),
CONFIG_MAX_RAM_BANK_SIZE);
return 0;
}
@@ -23,7 +23,7 @@ int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_MAX_RAM_BANK_SIZE);
return 0;
}
@@ -1307,8 +1307,8 @@ void sdram_init(void)
size_prog = log_2_n_round_down(size_prog);
size_prog = (1 << size_prog);
- size_detect = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
- size_prog);
+ size_detect = (u32)get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long)size_prog);
/* Compare with the size programmed */
if (size_detect != size_prog) {
printf("SDRAM: identified size not same as expected"
@@ -11,6 +11,6 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -146,7 +146,7 @@ long int fixed_sdram(ddr512x_config_t *mddrc_config,
/* Allow for the DLL to startup before accessing data */
udelay(10);
- msize = get_ram_size(CONFIG_SYS_DDR_BASE, CONFIG_SYS_MAX_RAM_SIZE);
+ msize = (u32)get_ram_size(CONFIG_SYS_DDR_BASE, CONFIG_SYS_MAX_RAM_SIZE);
/* Fix DDR Local Window for new size */
out_be32(&im->sysconf.ddrlaw.ar, __ilog2(msize) - 1);
sync_law(&im->sysconf.ddrlaw.ar);
@@ -192,7 +192,7 @@ phys_size_t initdram(int board_type)
udelay(10000);
- if (get_ram_size(0, mb0cf[i].size) == mb0cf[i].size) {
+ if (get_ram_size((unsigned long *)0, mb0cf[i].size) == mb0cf[i].size) {
phys_size_t size = mb0cf[i].size;
/*
@@ -210,7 +210,7 @@ phys_size_t initdram(int board_type)
* If the size not equal to the size of the first
* bank, then disable the 2nd bank completely.
*/
- if (get_ram_size((long *)mb0cf[i].size, mb0cf[i].size) !=
+ if (get_ram_size((unsigned long *)mb0cf[i].size, (unsigned long)mb0cf[i].size) !=
mb0cf[i].size) {
mtsdram(SDRAM0_B1CR, 0);
mtsdram(SDRAM0_CFG, 0);
@@ -394,7 +394,7 @@ phys_size_t initdram(int board_type)
mtsdram(SDRAM0_CFG0, CONFIG_SYS_SDRAM0_CFG0);
udelay(10000);
- if (get_ram_size(0, mb0cf[i].size) == mb0cf[i].size) {
+ if (get_ram_size((unsigned long *)0, mb0cf[i].size) == mb0cf[i].size) {
phys_size_t size = mb0cf[i].size;
/*
* Optimize TR1 to current hardware environment
@@ -418,7 +418,7 @@ phys_size_t initdram(int board_type)
* If the size not equal to the size of the first
* bank, then disable the 2nd bank completely.
*/
- if (get_ram_size((long *)mb0cf[i].size, mb0cf[i].size)
+ if (get_ram_size((unsigned long *)mb0cf[i].size, mb0cf[i].size)
!= mb0cf[i].size) {
mtsdram(SDRAM0_CFG0, 0);
mtsdram(SDRAM0_B1CR, 0);
@@ -38,7 +38,7 @@ int dram_init(void)
unsigned long expected_size = PHYS_SDRAM_0_SIZE + PHYS_SDRAM_1_SIZE;
unsigned long actual_size;
- actual_size = get_ram_size((void *)sdram_base, expected_size);
+ actual_size = get_ram_size((unsigned long *)sdram_base, expected_size);
gd->ram_size = actual_size;
@@ -38,7 +38,7 @@ int dram_init(void)
unsigned long expected_size = PHYS_SDRAM_0_SIZE + PHYS_SDRAM_1_SIZE;
unsigned long actual_size;
- actual_size = get_ram_size((void *)sdram_base, expected_size);
+ actual_size = get_ram_size((unsigned long *)sdram_base, expected_size);
gd->ram_size = actual_size;
@@ -43,7 +43,7 @@ int dram_init(void)
unsigned long expected_size = PHYS_SDRAM_0_SIZE;
unsigned long actual_size;
- actual_size = get_ram_size((void *)sdram_base, expected_size);
+ actual_size = get_ram_size((unsigned long *)sdram_base, expected_size);
gd->ram_size = actual_size;
@@ -121,7 +121,7 @@ void reset_phy(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -280,7 +280,7 @@ int misc_init_r(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -52,7 +52,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
@@ -312,7 +312,7 @@ dram_size (long int mamr_value, long int *base, long int maxsize)
memctl->memc_mamr = mamr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long)base, (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -218,7 +218,7 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long)base, (unsigned long)maxsize));
}
/*-----------------------------------------------------------------------------
* aschex_to_byte --
@@ -145,5 +145,5 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long)base, (unsigned long)maxsize));
}
@@ -160,5 +160,5 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long)base, (unsigned long)maxsize));
}
@@ -218,5 +218,5 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long)base, (unsigned long)maxsize));
}
@@ -25,10 +25,10 @@ int checkboard (void)
phys_size_t initdram (int board_type)
{
- long size;
- long new_bank0_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long mear1;
+ unsigned long emear1;
size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
@@ -100,9 +100,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -97,9 +97,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -81,7 +81,7 @@ phys_size_t initdram (int board_type)
memctl->memc_or1 = ~(CONFIG_SYS_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM;
memctl->memc_br1 = CONFIG_SYS_SDRAM_BASE | BR_PS_32 | BR_MS_UPMA | BR_V;
- msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_MAX_SIZE);
+ msize = (long int)get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_MAX_SIZE);
memctl->memc_or1 |= ~(msize - 1);
return msize;
@@ -153,7 +153,7 @@ int board_init(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
@@ -137,12 +137,12 @@ extern void dram_query(void);
*
*/
sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4;
- gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE +
REMAPPED_FLASH_SZ,
0x01000000 << sdram_shift);
}
#else
- gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE +
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE +
REMAPPED_FLASH_SZ,
PHYS_SDRAM_1_SIZE);
#endif /* CM_SPD_DETECT */
@@ -78,7 +78,7 @@ int misc_init_r (void)
int dram_init (void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -108,7 +108,7 @@ static void flash__init(void)
int dram_init(void)
{
gd->ram_size =
- get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, PHYS_SDRAM_1_SIZE);
+ get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -116,10 +116,10 @@ void dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size =
- get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[1].size =
- get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
+ get_ram_size((unsigned long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
}
int timer_init(void)
@@ -306,7 +306,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
@@ -48,7 +48,7 @@ int board_early_init_f(void)
int dram_init (void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -171,7 +171,7 @@ int board_init(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -261,7 +261,7 @@ int board_eth_init(bd_t *bis)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
@@ -270,7 +270,7 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
@@ -275,7 +275,7 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -242,7 +242,7 @@ int board_eth_init(bd_t *bis)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -197,7 +197,7 @@ int board_init(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -290,7 +290,7 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -77,7 +77,7 @@ phys_size_t initdram(int board_type)
sdram_base = uncached(EBI_SDRAM_BASE);
expected_size = sdram_init(sdram_base, &sdram_config);
- actual_size = get_ram_size(sdram_base, expected_size);
+ actual_size = get_ram_size((unsigned long *)sdram_base, expected_size);
if (expected_size != actual_size)
printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
@@ -94,7 +94,7 @@ phys_size_t initdram(int board_type)
sdram_base = uncached(EBI_SDRAM_BASE);
expected_size = sdram_init(sdram_base, &sdram_config);
- actual_size = get_ram_size(sdram_base, expected_size);
+ actual_size = get_ram_size((unsigned long *)sdram_base, expected_size);
if (expected_size != actual_size)
printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
@@ -99,7 +99,7 @@ phys_size_t initdram(int board_type)
sdram_base = uncached(EBI_SDRAM_BASE);
expected_size = sdram_init(sdram_base, &sdram_config);
- actual_size = get_ram_size(sdram_base, expected_size);
+ actual_size = get_ram_size((unsigned long *)sdram_base, expected_size);
if (expected_size != actual_size)
printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
@@ -191,7 +191,7 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -113,9 +113,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -141,9 +141,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
sdram_start(0);
- test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
+ test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
if (test1 > test2) {
sdram_start(0);
dramsize2 = test1;
@@ -146,7 +146,7 @@ int board_eth_init(bd_t *bis)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -151,7 +151,7 @@ int board_init(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -79,7 +79,7 @@ int board_init(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -90,9 +90,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -118,10 +118,10 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
@@ -114,9 +114,9 @@ phys_size_t initdram(int board_type)
*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = mem_conf->config2;
sdram_start(0, mem_conf);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1, mem_conf);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0, mem_conf);
dramsize = test1;
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
@@ -250,7 +250,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
@@ -252,7 +252,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
@@ -32,10 +32,10 @@ int checkboard (void)
phys_size_t initdram(int board_type)
{
- long size;
- long new_bank0_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long mear1;
+ unsigned long emear1;
size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
@@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -27,10 +27,10 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- u32 size1, size2;
+ unsigned long size1, size2;
- size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
- size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
+ size1 = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ size2 = get_ram_size((unsigned long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2;
@@ -67,7 +67,7 @@ phys_size_t initdram(int board_type)
{
unsigned long expected_size;
unsigned long actual_size;
- void *sdram_base;
+ unsigned long *sdram_base;
sdram_base = uncached(EBI_SDRAM_BASE);
@@ -105,7 +105,7 @@ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -171,7 +171,7 @@ int misc_init_r(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -93,7 +93,7 @@ phys_size_t initdram (int board_type)
memctl->memc_or1 = ~(CONFIG_SYS_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM;
memctl->memc_br1 = CONFIG_SYS_SDRAM_BASE | BR_PS_32 | BR_MS_UPMA | BR_V;
- msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_MAX_SIZE);
+ msize = (long int)get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_MAX_SIZE);
memctl->memc_or1 |= ~(msize - 1);
return msize;
@@ -90,9 +90,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
@@ -64,7 +64,7 @@ int board_early_init_f(void)
phys_size_t initdram(int board_type)
{
- return get_ram_size(0, fixed_sdram(NULL, NULL, 0));
+ return get_ram_size((unsigned long *)0, (unsigned long)fixed_sdram(NULL, NULL, 0));
}
int misc_init_r(void)
@@ -125,7 +125,7 @@ static void meesc_ethercat_hw_init(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -222,7 +222,7 @@ void lcd_show_board_info(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -90,9 +90,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
@@ -49,7 +49,7 @@ phys_size_t initdram(int board_type)
#endif
/* Now check memory size (after ECC is initialized) */
- msize = get_ram_size(0, msize);
+ msize = get_ram_size((unsigned long *)0, (unsigned long)msize);
/* return total bus SDRAM size(bytes) -- DDR */
return msize * 1024 * 1024;
@@ -45,7 +45,7 @@ static void weim_nor_settings(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -129,8 +129,8 @@ phys_size_t initdram (int board_type)
* Check Bank 0 Memory Size for re-configuration
*
*/
- size_b0 = get_ram_size ( (long *)SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE);
- size_b1 = get_ram_size ( (long *)SDRAM_BASE3_PRELIM, SDRAM_MAX_SIZE);
+ size_b0 = get_ram_size ( (unsigned long *)SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE);
+ size_b1 = get_ram_size ( (unsigned long *)SDRAM_BASE3_PRELIM, SDRAM_MAX_SIZE);
printf ("\nbank 0 size %lu\nbank 1 size %lu\n", size_b0, size_b1);
@@ -158,7 +158,7 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -45,7 +45,7 @@ int board_early_init_f(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -255,7 +255,7 @@ static int _draminit (uint base, uint noMbytes, uint edo, uint delay)
/* check bytes / 2 because get_ram_size tests at base+bytes, which
* is not mapped */
if (noMbytes == 8)
- if (get_ram_size ((long *) base, noMbytes << 19) != noMbytes << 19) {
+ if (get_ram_size ((unsigned long *) base, noMbytes << 19) != noMbytes << 19) {
*((uint *) BCSR1) |= BCSR1_DRAM_EN; /* disable dram */
return -1;
}
@@ -31,7 +31,7 @@ int dram_init(void)
unsigned long expected_size = PHYS_SDRAM_1_SIZE;
unsigned long actual_size;
- actual_size = get_ram_size((void *)sdram_base, expected_size);
+ actual_size = get_ram_size((unsigned long *)sdram_base, expected_size);
gd->ram_size = actual_size;
@@ -62,7 +62,7 @@ static long fixed_sdram(void)
setbits_be32(&im->ddr.sdram_cfg, SDRAM_CFG_MEM_EN);
sync();
- return get_ram_size(CONFIG_SYS_DDR_SDRAM_BASE, msize);
+ return (long)get_ram_size(CONFIG_SYS_DDR_SDRAM_BASE, msize);
}
phys_size_t initdram(int board_type)
@@ -85,7 +85,7 @@ static void mx25pdk_fec_init(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -16,7 +16,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -45,7 +45,7 @@ void board_init_f(ulong bootflag)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -37,10 +37,10 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- u32 size1, size2;
+ unsigned long size1, size2;
- size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
- size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
+ size1 = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ size2 = get_ram_size((unsigned long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2;
@@ -34,7 +34,7 @@ struct fsl_esdhc_cfg esdhc_cfg[2] = {
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -23,10 +23,10 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- u32 size1, size2;
+ unsigned long size1, size2;
- size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
- size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
+ size1 = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ size2 = get_ram_size((unsigned long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2;
@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -32,10 +32,10 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- u32 size1, size2;
+ unsigned long size1, size2;
- size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
- size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
+ size1 = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ size2 = get_ram_size((unsigned long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2;
@@ -21,10 +21,10 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- u32 size1, size2;
+ unsigned long size1, size2;
- size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
- size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
+ size1 = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ size2 = get_ram_size((unsigned long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2;
@@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
@@ -45,7 +45,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
@@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
@@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
@@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
@@ -235,7 +235,7 @@ int dram_init(void)
setup_iomux_ddr();
ddr_ctrl_init();
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0;
}
@@ -103,7 +103,7 @@ int dram_init(void)
writel(B6_MRSR, &memctl->mrsrb6);
writel(B7_MRSR, &memctl->mrsrb7);
- gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_SIZE);
return 0;
}
@@ -96,9 +96,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
+ test1 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
sdram_start(1);
- test2 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
+ test2 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -117,7 +117,7 @@ u32 get_board_rev(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -252,11 +252,11 @@ phys_size_t initdram (int board_type)
static long int dram_size (long int mbmr_value, long int *base,
long int maxsize)
{
- long size;
+ unsigned long size;
/*memctl->memc_mbmr = mbmr_value; */
- size = get_ram_size (base, maxsize);
+ size = get_ram_size ((unsigned long *)base, (unsigned long *)maxsize);
if (size) {
/* printf("(%08lx)", size); */
@@ -264,7 +264,7 @@ static long int dram_size (long int mbmr_value, long int *base,
printf ("(0)");
}
- return (size);
+ return (long int)(size);
}
#if defined(CONFIG_CMD_PCMCIA)
@@ -122,7 +122,7 @@ static void tt01_spi3_hw_init(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -210,7 +210,8 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base,
+ (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -31,10 +31,10 @@ int checkboard (void)
phys_size_t initdram (int board_type)
{
- long size;
- long new_bank0_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long mear1;
+ unsigned long emear1;
size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
@@ -145,9 +145,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -173,10 +173,10 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
@@ -39,7 +39,7 @@ int board_init(void)
int dram_init(void)
{
pxa2xx_dram_init();
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -195,5 +195,5 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base, (unsigned long)maxsize));
}
@@ -254,10 +254,10 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
- return (size);
+ return (long int)(size);
}
phys_size_t initdram (int board_type)
@@ -93,9 +93,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -122,11 +122,11 @@ phys_size_t initdram(int board_type)
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize),
+ test2 = test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize),
0x80000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize),
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize),
0x80000000);
}
@@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -73,7 +73,7 @@ phys_size_t initdram(int board_type)
{
unsigned long expected_size;
unsigned long actual_size;
- void *sdram_base;
+ unsigned long *sdram_base;
sdram_base = uncached(EBI_SDRAM_BASE);
@@ -59,7 +59,7 @@ phys_size_t initdram(int board_type)
{
*INCA_IP_SDRAM_MC_CFGPB0 = (0x14 << 8) |
(rows << 4) | cols;
- size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+ size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
max_sdram_size());
if (size > max_size)
@@ -87,7 +87,7 @@ phys_size_t initdram (int board_type)
(struct mpc5xxx_sdram *) MPC5XXX_SDRAM;
ulong dramsize = 0;
#ifndef CONFIG_SYS_RAMBOOT
- long test1, test2;
+ unsigned long test1, test2;
/* setup SDRAM chip selects */
out_be32(&mm->sdram0, 0x0000001c); /* 512MB at 0x0 */
@@ -104,9 +104,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -97,9 +97,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x08000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -123,7 +123,7 @@ phys_size_t initdram(int board_type)
out_be32((void *)MPC5XXX_SDRAM_CS1CFG, dramsize + 0x0000001C);
/* find RAM size using SDRAM CS1 only */
- test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize),
+ test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize),
0x08000000);
dramsize2 = test1;
@@ -240,7 +240,8 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base,
+ (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -103,9 +103,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start (0);
- test1 = get_ram_size ((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size ((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start (1);
- test2 = get_ram_size ((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size ((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start (0);
dramsize = test1;
@@ -220,7 +220,7 @@ phys_size_t initdram (int board_type)
*/
maxsize = (1 + (~memctl->memc_or1 | 0x7fff)) / 2;
- maxsize = get_ram_size((long *)base, maxsize);
+ maxsize = get_ram_size((unsigned long *)base, maxsize);
memctl->memc_or1 |= ~(maxsize - 1);
@@ -398,7 +398,7 @@ phys_size_t initdram (int board_type)
*/
maxsize = (~(memctl->memc_or1 & BRx_BA_MSK) + 1) / 2;
- maxsize = get_ram_size((long *)(memctl->memc_br1 & BRx_BA_MSK), maxsize);
+ maxsize = (long)get_ram_size((unsigned long *)(memctl->memc_br1 & BRx_BA_MSK), maxsize);
memctl->memc_or1 |= ~(maxsize - 1);
@@ -261,7 +261,8 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mbmr = mamr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long)base,
+ (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -103,9 +103,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -131,10 +131,10 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
@@ -184,7 +184,7 @@ int board_late_init(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -192,11 +192,11 @@ int dram_init(void)
void dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = get_ram_size((void *)PHYS_SDRAM_1,
+ gd->bd->bi_dram[0].size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
#if CONFIG_NR_DRAM_BANKS > 1
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
- gd->bd->bi_dram[1].size = get_ram_size((void *)PHYS_SDRAM_2,
+ gd->bd->bi_dram[1].size = get_ram_size((unsigned long *)PHYS_SDRAM_2,
PHYS_SDRAM_2_SIZE);
#else
@@ -236,7 +236,7 @@ static long int try_init(memctl8260_t *memctl, ulong sdmr,
out_be32(&memctl->memc_psdmr, sdmr | PSDMR_OP_NORM | PSDMR_RFEN);
out_8(base, c);
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
out_be32(&memctl->memc_or1, orx | ~(size - 1));
return size;
@@ -52,7 +52,7 @@ int board_init(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -60,11 +60,11 @@ int dram_init(void)
void dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
- gd->bd->bi_dram[0].size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->bd->bi_dram[0].size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE);
#if CONFIG_NR_DRAM_BANKS > 1
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
- gd->bd->bi_dram[1].size = get_ram_size((void *)PHYS_SDRAM_2,
+ gd->bd->bi_dram[1].size = get_ram_size((unsigned long *)PHYS_SDRAM_2,
PHYS_SDRAM_2_SIZE);
#endif
}
@@ -17,7 +17,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -315,7 +315,7 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base, (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -89,9 +89,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -102,9 +102,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start (0);
- test1 = get_ram_size ((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test1 = get_ram_size ((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
sdram_start(1);
- test2 = get_ram_size ((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test2 = get_ram_size ((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
if (test1 > test2) {
sdram_start (0);
dramsize = test1;
@@ -131,10 +131,10 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start (0);
- test2 = test1 = get_ram_size ((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
+ test2 = test1 = get_ram_size ((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
if (!dramsize) {
sdram_start (1);
- test2 = get_ram_size ((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
+ test2 = get_ram_size ((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
}
if (test1 > test2) {
sdram_start (0);
@@ -155,9 +155,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -70,9 +70,9 @@ phys_addr_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -81,9 +81,9 @@ phys_addr_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -106,9 +106,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -134,10 +134,10 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
@@ -61,7 +61,7 @@ void _machine_restart(void)
*/
phys_size_t initdram(int board_type)
{
- return get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
+ return get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_MBYTES_SDRAM << 20);
}
@@ -155,7 +155,7 @@ phys_size_t initdram(int board_type)
{
unsigned long expected_size;
unsigned long actual_size;
- void *sdram_base;
+ unsigned long *sdram_base;
sdram_base = uncached(EBI_SDRAM_BASE);
@@ -78,7 +78,7 @@ phys_size_t initdram(int board_type)
{
unsigned long expected_size;
unsigned long actual_size;
- void *sdram_base;
+ unsigned long *sdram_base;
sdram_base = uncached(EBI_SDRAM_BASE);
@@ -137,9 +137,9 @@ phys_size_t initdram(int board_type)
*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2;
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -232,7 +232,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size ((long *)base, maxsize);
+ size = get_ram_size ((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
return (size);
@@ -83,9 +83,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = (ulong )get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x10000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x10000000);
sdram_start(1);
- test2 = (ulong )get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x10000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x10000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -32,10 +32,10 @@ int checkflash (void)
phys_size_t initdram (int board_type)
{
- long size;
- long new_bank0_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long mear1;
+ unsigned long emear1;
size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
@@ -79,10 +79,10 @@ int checkboard (void)
phys_size_t initdram (int board_type)
{
- long size;
- long new_bank0_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long mear1;
+ unsigned long emear1;
size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
@@ -155,7 +155,7 @@ int board_late_init (void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -447,7 +447,7 @@ phys_size_t initdram(int board_type)
}
}
- size = get_ram_size((long *)0, SDRAM_MAX_SIZE);
+ size = (long int)get_ram_size((unsigned long *)0, SDRAM_MAX_SIZE);
if (size == 0) {
printf("SIZE is zero: LOOP on 0\n");
@@ -380,7 +380,7 @@ phys_size_t initdram(int board_type)
}
}
- size = get_ram_size((long *)0, SDRAM_MAX_SIZE);
+ size = (long int)get_ram_size((unsigned long *)0, SDRAM_MAX_SIZE);
#if 0
printf("check 0\n");
@@ -445,7 +445,7 @@ phys_size_t initdram(int board_type)
}
}
- size = get_ram_size((long *)0, SDRAM_MAX_SIZE);
+ size = (long int)get_ram_size((unsigned long *)0, SDRAM_MAX_SIZE);
if (size == 0) {
printf("SIZE is zero: LOOP on 0\n");
@@ -342,7 +342,8 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long *)base,
+ (unsigned long)maxsize));
}
int misc_init_r (void)
@@ -103,9 +103,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
+ test1 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
sdram_start(1);
- test2 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
+ test2 = get_ram_size((unsigned long *) CONFIG_SYS_SDRAM_BASE, 0x10000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -93,9 +93,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -121,10 +121,10 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
@@ -256,7 +256,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
@@ -63,10 +63,10 @@ int checkboard (void)
phys_size_t initdram (int board_type)
{
- long size;
- long new_bank0_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long mear1;
+ unsigned long emear1;
show_startup_phase (2);
@@ -245,7 +245,7 @@ static long int dram_size (long int mamr_value,
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base, (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -238,7 +238,8 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mamr = mamr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long *)base,
+ (unsigned long)maxsize));
}
#ifdef CONFIG_CMD_DOC
@@ -268,7 +268,7 @@ int board_eth_init(bd_t *bis)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM,
PHYS_SDRAM_SIZE);
return 0;
}
@@ -363,7 +363,7 @@ int board_init(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM,
PHYS_SDRAM_SIZE);
return 0;
}
@@ -146,7 +146,7 @@ int board_init(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM,
PHYS_SDRAM_SIZE);
return 0;
}
@@ -24,7 +24,7 @@ int dram_init(void)
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
- gd->ram_size += get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+ gd->ram_size += get_ram_size((unsigned long *)addr, SDRAM_BANK_SIZE);
}
return 0;
}
@@ -42,7 +42,7 @@ void dram_init_banksize(void)
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
- size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+ size = get_ram_size((unsigned long *)addr, SDRAM_BANK_SIZE);
gd->bd->bi_dram[i].start = addr;
gd->bd->bi_dram[i].size = size;
@@ -71,10 +71,14 @@ int board_early_init_f(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE)
- + get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE)
- + get_ram_size((long *)PHYS_SDRAM_3, PHYS_SDRAM_3_SIZE)
- + get_ram_size((long *)PHYS_SDRAM_4, PHYS_SDRAM_4_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_2,
+ PHYS_SDRAM_2_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_3,
+ PHYS_SDRAM_3_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_4,
+ PHYS_SDRAM_4_SIZE);
return 0;
}
@@ -82,16 +86,16 @@ int dram_init(void)
void dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = get_ram_size((long *)PHYS_SDRAM_1, \
+ gd->bd->bi_dram[0].size = get_ram_size((unsigned long *)PHYS_SDRAM_1, \
PHYS_SDRAM_1_SIZE);
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
- gd->bd->bi_dram[1].size = get_ram_size((long *)PHYS_SDRAM_2, \
+ gd->bd->bi_dram[1].size = get_ram_size((unsigned long *)PHYS_SDRAM_2, \
PHYS_SDRAM_2_SIZE);
gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
- gd->bd->bi_dram[2].size = get_ram_size((long *)PHYS_SDRAM_3, \
+ gd->bd->bi_dram[2].size = get_ram_size((unsigned long *)PHYS_SDRAM_3, \
PHYS_SDRAM_3_SIZE);
gd->bd->bi_dram[3].start = PHYS_SDRAM_4;
- gd->bd->bi_dram[3].size = get_ram_size((long *)PHYS_SDRAM_4, \
+ gd->bd->bi_dram[3].size = get_ram_size((unsigned long *)PHYS_SDRAM_4, \
PHYS_SDRAM_4_SIZE);
}
@@ -134,11 +134,11 @@ int board_init(void)
int dram_init(void)
{
int i;
- u32 addr;
+ unsigned long addr;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
- gd->ram_size += get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+ gd->ram_size += get_ram_size((unsigned long *)addr, SDRAM_BANK_SIZE);
}
return 0;
}
@@ -263,11 +263,11 @@ int power_init_board(void)
void dram_init_banksize(void)
{
int i;
- u32 addr, size;
+ unsigned long addr, size;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
- size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+ size = get_ram_size((unsigned long *)addr, SDRAM_BANK_SIZE);
gd->bd->bi_dram[i].start = addr;
gd->bd->bi_dram[i].size = size;
@@ -72,11 +72,11 @@ int board_init(void)
int dram_init(void)
{
int i;
- u32 addr;
+ unsigned long addr;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
- gd->ram_size += get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+ gd->ram_size += get_ram_size((unsigned long *)addr, SDRAM_BANK_SIZE);
}
return 0;
}
@@ -201,10 +201,10 @@ int power_init_board(void)
void dram_init_banksize(void)
{
int i;
- u32 addr, size;
+ unsigned long addr, size;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
- size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+ size = get_ram_size((unsigned long *)addr, SDRAM_BANK_SIZE);
gd->bd->bi_dram[i].start = addr;
gd->bd->bi_dram[i].size = size;
}
@@ -49,7 +49,7 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -49,10 +49,14 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE)
- + get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE)
- + get_ram_size((long *)PHYS_SDRAM_3, PHYS_SDRAM_3_SIZE)
- + get_ram_size((long *)PHYS_SDRAM_4, PHYS_SDRAM_4_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_2,
+ PHYS_SDRAM_2_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_3,
+ PHYS_SDRAM_3_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_4,
+ PHYS_SDRAM_4_SIZE);
return 0;
}
@@ -60,16 +64,16 @@ int dram_init(void)
void dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = get_ram_size((long *)PHYS_SDRAM_1, \
+ gd->bd->bi_dram[0].size = get_ram_size((unsigned long *)PHYS_SDRAM_1, \
PHYS_SDRAM_1_SIZE);
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
- gd->bd->bi_dram[1].size = get_ram_size((long *)PHYS_SDRAM_2, \
+ gd->bd->bi_dram[1].size = get_ram_size((unsigned long *)PHYS_SDRAM_2, \
PHYS_SDRAM_2_SIZE);
gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
- gd->bd->bi_dram[2].size = get_ram_size((long *)PHYS_SDRAM_3, \
+ gd->bd->bi_dram[2].size = get_ram_size((unsigned long *)PHYS_SDRAM_3, \
PHYS_SDRAM_3_SIZE);
gd->bd->bi_dram[3].start = PHYS_SDRAM_4;
- gd->bd->bi_dram[3].size = get_ram_size((long *)PHYS_SDRAM_4, \
+ gd->bd->bi_dram[3].size = get_ram_size((unsigned long *)PHYS_SDRAM_4, \
PHYS_SDRAM_4_SIZE);
}
@@ -347,10 +347,14 @@ int power_init_board(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) +
- get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE) +
- get_ram_size((long *)PHYS_SDRAM_3, PHYS_SDRAM_3_SIZE) +
- get_ram_size((long *)PHYS_SDRAM_4, PHYS_SDRAM_4_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_2,
+ PHYS_SDRAM_2_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_3,
+ PHYS_SDRAM_3_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_4,
+ PHYS_SDRAM_4_SIZE);
return 0;
}
@@ -60,8 +60,10 @@ int power_init_board(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) +
- get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
+ PHYS_SDRAM_1_SIZE)
+ + get_ram_size((unsigned long *)PHYS_SDRAM_2,
+ PHYS_SDRAM_2_SIZE);
return 0;
}
@@ -37,10 +37,10 @@ int checkflash (void)
phys_size_t initdram (int board_type)
{
- long size;
- long new_bank0_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long mear1;
+ unsigned long emear1;
size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
@@ -20,7 +20,7 @@ int board_init (void)
int dram_init (void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)SCB9328_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)SCB9328_SDRAM_1,
SCB9328_SDRAM_1_SIZE);
return 0;
@@ -210,5 +210,5 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base, (unsigned long)maxsize));
}
@@ -216,5 +216,5 @@ static long int dram_size (long int mbmr_value, long int *base, long int maxsize
memctl->memc_mbmr = mbmr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base, (unsigned long)maxsize));
}
@@ -49,7 +49,7 @@ phys_size_t fixed_sdram(void)
asm ("sync; isync; msync");
udelay(1000);
- if (get_ram_size(0, CONFIG_SYS_SDRAM_SIZE<<20) == CONFIG_SYS_SDRAM_SIZE<<20) {
+ if (get_ram_size((unsigned long *)0, CONFIG_SYS_SDRAM_SIZE<<20) == CONFIG_SYS_SDRAM_SIZE<<20) {
/*
* OK, size detected -> all done
*/
@@ -182,7 +182,7 @@ static long int dram_size (long int mbmr_value, long int *base,
memctl->memc_mbmr = mbmr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long *)base, (unsigned long)maxsize));
}
@@ -215,7 +215,7 @@ static long int dram_size (long int mamr_value, long int *base,
memctl->memc_mbmr = mamr_value;
- return (get_ram_size (base, maxsize));
+ return (long int)(get_ram_size ((unsigned long *)base, (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -387,7 +387,7 @@ phys_size_t initdram(int board_type)
{
volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
- long int size;
+ unsigned long size;
u32 d1, d2;
upmconfig(UPMA, (uint *) sdram_table, sizeof(sdram_table) / sizeof(sdram_table[0]));
@@ -448,7 +448,7 @@ phys_size_t initdram(int board_type)
DO_LOOP;
}
- size = get_ram_size((long *)0, SDRAM_MAX_SIZE);
+ size = get_ram_size((unsigned long *)0, SDRAM_MAX_SIZE);
return size;
}
@@ -138,7 +138,7 @@ int misc_init_r(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM,
PHYS_SDRAM_SIZE);
return 0;
@@ -168,7 +168,7 @@ int board_late_init(void)
int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
- gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM,
PHYS_SDRAM_SIZE);
return 0;
}
@@ -175,7 +175,7 @@ int board_init(void)
int dram_init(void)
{
gd->ram_size = get_ram_size(
- (void *)CONFIG_SYS_SDRAM_BASE,
+ (unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
}
@@ -118,7 +118,7 @@ void ether__init (void)
******************************/
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
return 0;
}
@@ -45,7 +45,7 @@ int board_init(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+ gd->ram_size = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE);
return 0;
@@ -85,9 +85,9 @@ long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf)
/* find RAM size using SDRAM CS0 only */
mpc5xxx_sdram_start(sdram_conf, 0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
mpc5xxx_sdram_start(sdram_conf, 1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
mpc5xxx_sdram_start(sdram_conf, 0);
dramsize = test1;
@@ -112,9 +112,9 @@ long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf)
/* find RAM size using SDRAM CS1 only */
mpc5xxx_sdram_start(sdram_conf, 0);
- test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
mpc5xxx_sdram_start(sdram_conf, 1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
if (test1 > test2) {
mpc5xxx_sdram_start(sdram_conf, 0);
dramsize2 = test1;
@@ -158,9 +158,9 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -187,10 +187,10 @@ phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
+ test2 = test1 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
+ test2 = get_ram_size((unsigned long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
}
if (test1 > test2) {
sdram_start(0);
@@ -261,10 +261,10 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
- return (size);
+ return (long int)(size);
}
phys_size_t initdram (int board_type)
@@ -429,10 +429,10 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- size = get_ram_size((long *)base, maxsize);
+ size = get_ram_size((unsigned long *)base, maxsize);
*orx_ptr = orx | ~(size - 1);
- return (size);
+ return (long int)(size);
}
phys_size_t initdram (int board_type)
@@ -279,7 +279,7 @@ static long int get_ddr_bank_size(short cs, long *base)
set_cs_config(cs, CSCONFIG_EN | conf[i].col | conf[i].row);
debug("Getting RAM size...\n");
- size = get_ram_size(base, DDR_MAX_SIZE_PER_CS);
+ size = (long)get_ram_size((unsigned long *)base, DDR_MAX_SIZE_PER_CS);
if((size == conf[i].size) && (i == detected + 1))
detected = i;
@@ -411,7 +411,7 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
memctl->memc_mamr = mamr_value;
- return (get_ram_size(base, maxsize));
+ return (long int)(get_ram_size((unsigned long *)base, (unsigned long)maxsize));
}
/* ------------------------------------------------------------------------- */
@@ -116,7 +116,7 @@ static void init_drive_strength(void)
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
@@ -33,11 +33,11 @@ int checkboard(void)
phys_size_t initdram(int board_type)
{
- long size;
- long new_bank0_end;
- long new_bank1_end;
- long mear1;
- long emear1;
+ unsigned long size;
+ unsigned long new_bank0_end;
+ unsigned long new_bank1_end;
+ unsigned long mear1;
+ unsigned long emear1;
size = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE);
@@ -83,9 +83,9 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
sdram_start(1);
- test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((unsigned long *)CONFIG_SYS_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@ -108,10 +108,10 @@ phys_size_t initdram(int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *) (CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((unsigned long *) (CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *) (CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((unsigned long *) (CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
@@ -81,7 +81,7 @@ static long fixed_sdram(void)
/* now check the real size */
disable_addr_trans ();
- msize = get_ram_size (CONFIG_SYS_DDR_BASE, msize);
+ msize = (u32)get_ram_size (CONFIG_SYS_DDR_BASE, msize);
enable_addr_trans ();
#endif
@@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1,
+ gd->ram_size = get_ram_size((unsigned long *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE);
return 0;
@@ -295,7 +295,7 @@ int fpga_post_test(int flags)
out_be32((void *)FPGA_STAT, in_be32((void *)FPGA_STAT) | 0x1000);
/* get RAM size */
- read_value = get_ram_size((void *)CONFIG_SYS_FPGA_BASE_1, FPGA_RAM_SIZE);
+ read_value = (uint)get_ram_size((unsigned long *)CONFIG_SYS_FPGA_BASE_1, FPGA_RAM_SIZE);
post_log("FPGA RAM size %d bytes\n", read_value);
WATCHDOG_RESET();
@@ -303,7 +303,7 @@ int gdc_post_test(int flags)
(old_value >> 8) & 0xFF, old_value & 0xFF,
(old_value >> 16) & 0xFFFF);
- old_value = get_ram_size((void *)GDC_RAM_START,
+ old_value = (uint)get_ram_size((unsigned long *)GDC_RAM_START,
0x02000000);
debug("GDC RAM size (ist): %d bytes\n", old_value);
--
1.8.1.5