diff options
273 files changed, 283 insertions, 283 deletions
diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c index dcfd83ed2..fad9c406d 100644 --- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c +++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c @@ -39,7 +39,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { int size,i; diff --git a/board/LEOX/elpt860/elpt860.c b/board/LEOX/elpt860/elpt860.c index 775db738e..5f506314c 100644 --- a/board/LEOX/elpt860/elpt860.c +++ b/board/LEOX/elpt860/elpt860.c @@ -35,7 +35,7 @@ ** ------ ** int board_early_init_f(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' ** ** 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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c index 3bbc09dd9..e118563fc 100644 --- a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c +++ b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c @@ -81,7 +81,7 @@ int checkboard (void) return 0; } -long initdram (int board_type) +phys_size_t initdram (int board_type) { return articiaS_ram_init (); } diff --git a/board/Marvell/db64360/sdram_init.c b/board/Marvell/db64360/sdram_init.c index f04aaf9a6..ecadaf271 100644 --- a/board/Marvell/db64360/sdram_init.c +++ b/board/Marvell/db64360/sdram_init.c @@ -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 * controlling logic happens */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { int s0 = 0, s1 = 0; int checkbank[4] = {[0 ... 3] = 0 }; diff --git a/board/Marvell/db64460/sdram_init.c b/board/Marvell/db64460/sdram_init.c index 176220232..f36f3484a 100644 --- a/board/Marvell/db64460/sdram_init.c +++ b/board/Marvell/db64460/sdram_init.c @@ -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 * controlling logic happens */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { int s0 = 0, s1 = 0; int checkbank[4] = {[0 ... 3] = 0 }; diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c index 49cb8ad24..804635a4a 100644 --- a/board/RPXClassic/RPXClassic.c +++ b/board/RPXClassic/RPXClassic.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/RPXlite/RPXlite.c b/board/RPXlite/RPXlite.c index f37e07b92..bca31e4c8 100644 --- a/board/RPXlite/RPXlite.c +++ b/board/RPXlite/RPXlite.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/RPXlite_dw/RPXlite_dw.c b/board/RPXlite_dw/RPXlite_dw.c index d3dc08121..d6fabf04e 100644 --- a/board/RPXlite_dw/RPXlite_dw.c +++ b/board/RPXlite_dw/RPXlite_dw.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/RRvision/RRvision.c b/board/RRvision/RRvision.c index f46bb9e8e..c0b772d72 100644 --- a/board/RRvision/RRvision.c +++ b/board/RRvision/RRvision.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/a3000/a3000.c b/board/a3000/a3000.c index 737d35d76..c1eceaa2f 100644 --- a/board/a3000/a3000.c +++ b/board/a3000/a3000.c @@ -38,7 +38,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long size; long new_bank0_end; diff --git a/board/adder/adder.c b/board/adder/adder.c index 817c8649a..e8a5737f5 100644 --- a/board/adder/adder.c +++ b/board/adder/adder.c @@ -65,7 +65,7 @@ static uint sdram_table[] = { 0xfffffc27, 0xfffffc04, 0xfffffc04, 0xfffffc04 }; -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long int msize; volatile immap_t *immap = (volatile immap_t *)CFG_IMMR; diff --git a/board/ads5121/ads5121.c b/board/ads5121/ads5121.c index 289266529..ef6666333 100644 --- a/board/ads5121/ads5121.c +++ b/board/ads5121/ads5121.c @@ -112,7 +112,7 @@ int board_early_init_f (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { u32 msize = 0; diff --git a/board/alaska/alaska.c b/board/alaska/alaska.c index 9531703fc..49a8f712b 100644 --- a/board/alaska/alaska.c +++ b/board/alaska/alaska.c @@ -131,7 +131,7 @@ void setupBat (ulong size) mtspr (DBAT7U, batu); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong size; diff --git a/board/altera/dk1c20/dk1c20.c b/board/altera/dk1c20/dk1c20.c index d0eb9eacb..46695bea9 100644 --- a/board/altera/dk1c20/dk1c20.c +++ b/board/altera/dk1c20/dk1c20.c @@ -50,7 +50,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/altera/dk1s10/dk1s10.c b/board/altera/dk1s10/dk1s10.c index c45e7f15d..64d591e71 100644 --- a/board/altera/dk1s10/dk1s10.c +++ b/board/altera/dk1s10/dk1s10.c @@ -54,7 +54,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/altera/ep1c20/ep1c20.c b/board/altera/ep1c20/ep1c20.c index 29491391e..c5bfb85a7 100644 --- a/board/altera/ep1c20/ep1c20.c +++ b/board/altera/ep1c20/ep1c20.c @@ -34,7 +34,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/altera/ep1s10/ep1s10.c b/board/altera/ep1s10/ep1s10.c index 9c7e28e68..de9bf42bd 100644 --- a/board/altera/ep1s10/ep1s10.c +++ b/board/altera/ep1s10/ep1s10.c @@ -34,7 +34,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/altera/ep1s40/ep1s40.c b/board/altera/ep1s40/ep1s40.c index cb7555047..c0eca17b9 100644 --- a/board/altera/ep1s40/ep1s40.c +++ b/board/altera/ep1s40/ep1s40.c @@ -29,7 +29,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/amcc/acadia/memory.c b/board/amcc/acadia/memory.c index 3dec3159a..48a672574 100644 --- a/board/amcc/acadia/memory.c +++ b/board/amcc/acadia/memory.c @@ -59,7 +59,7 @@ static void cram_bcr_write(u32 wr_val) } #endif -long int initdram(int board_type) +phys_size_t initdram(int board_type) { #if defined(CONFIG_NAND_SPL) u32 reg; diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c index 0c7d69e78..f4157017f 100644 --- a/board/amcc/bamboo/bamboo.c +++ b/board/amcc/bamboo/bamboo.c @@ -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)) long dram_size; diff --git a/board/amcc/bubinga/bubinga.c b/board/amcc/bubinga/bubinga.c index 9d508b893..74a2a1c21 100644 --- a/board/amcc/bubinga/bubinga.c +++ b/board/amcc/bubinga/bubinga.c @@ -70,7 +70,7 @@ int checkboard(void) initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of the necessary info for SDRAM controller configuration ------------------------------------------------------------------------- */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { long int ret; diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 4e3b349ef..e0e0211a6 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -205,7 +205,7 @@ u32 ddr_clktr(u32 default_val) { * I2C SPD DIMM autodetection/calibration doesn't fit into the 4k of boot * code. */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return CFG_MBYTES_SDRAM << 20; } diff --git a/board/amcc/ebony/ebony.c b/board/amcc/ebony/ebony.c index c6375aca8..9bcdf5997 100644 --- a/board/amcc/ebony/ebony.c +++ b/board/amcc/ebony/ebony.c @@ -104,7 +104,7 @@ int checkboard(void) return (0); } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/amcc/ocotea/ocotea.c b/board/amcc/ocotea/ocotea.c index 79c1a1b49..eea1e1e17 100644 --- a/board/amcc/ocotea/ocotea.c +++ b/board/amcc/ocotea/ocotea.c @@ -201,7 +201,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c index b43ec4809..77e6c7b4d 100644 --- a/board/amcc/sequoia/sdram.c +++ b/board/amcc/sequoia/sdram.c @@ -52,7 +52,7 @@ extern void denali_core_search_data_eye(void); * 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_SPL) diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c index e4fdf4ae7..254e3eb83 100644 --- a/board/amcc/taihu/taihu.c +++ b/board/amcc/taihu/taihu.c @@ -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 */ } diff --git a/board/amcc/walnut/walnut.c b/board/amcc/walnut/walnut.c index 641987e87..28dcb66eb 100644 --- a/board/amcc/walnut/walnut.c +++ b/board/amcc/walnut/walnut.c @@ -89,7 +89,7 @@ int checkboard(void) * initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of * the necessary info for SDRAM controller configuration */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return spd_sdram(); } diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index 83455375d..3b1f8e2d7 100644 --- a/board/amcc/yosemite/yosemite.c +++ b/board/amcc/yosemite/yosemite.c @@ -281,7 +281,7 @@ void sdram_tr1_set(int ram_address, int* tr1_value) *tr1_value = (first_good + last_bad) / 2; } -long int initdram(int board) +phys_size_t initdram(int board) { register uint reg; int tr1_bank1, tr1_bank2; diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c index 7d11b29b5..55277e72d 100644 --- a/board/amirix/ap1000/ap1000.c +++ b/board/amirix/ap1000/ap1000.c @@ -133,7 +133,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { char *s = getenv ("dramsize"); diff --git a/board/atc/atc.c b/board/atc/atc.c index fe3215582..79527f438 100644 --- a/board/atc/atc.c +++ b/board/atc/atc.c @@ -340,7 +340,7 @@ int misc_init_r(void) return (0); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/atmel/atngw100/atngw100.c b/board/atmel/atngw100/atngw100.c index c649855d6..375f0e7e1 100644 --- a/board/atmel/atngw100/atngw100.c +++ b/board/atmel/atngw100/atngw100.c @@ -64,7 +64,7 @@ int board_early_init_f(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { unsigned long expected_size; unsigned long actual_size; diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c index 33bdba6f5..6371e2d4e 100644 --- a/board/atmel/atstk1000/atstk1000.c +++ b/board/atmel/atstk1000/atstk1000.c @@ -90,7 +90,7 @@ int board_early_init_f(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { unsigned long expected_size; unsigned long actual_size; diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c index 2f6ae29d9..4d8c6fbae 100644 --- a/board/atum8548/atum8548.c +++ b/board/atum8548/atum8548.c @@ -98,7 +98,7 @@ long int fixed_sdram (void) } #endif /* !defined(CONFIG_SPD_EEPROM) */ -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/barco/barco.c b/board/barco/barco.c index becbd0abd..72e7e0b05 100644 --- a/board/barco/barco.c +++ b/board/barco/barco.c @@ -83,7 +83,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long size; long new_bank0_end; diff --git a/board/barco/barco_svc.h b/board/barco/barco_svc.h index 088f61e74..bd924f2b1 100644 --- a/board/barco/barco_svc.h +++ b/board/barco/barco_svc.h @@ -59,7 +59,7 @@ typedef struct SBootInfo { /* barcohydra.c */ int checkboard(void); -long int initdram(int board_type); +phys_size_t initdram(int board_type); void pci_init_board(void); void check_flash(void); int write_flash(char *addr, char value); diff --git a/board/bc3450/bc3450.c b/board/bc3450/bc3450.c index 56a73fe4d..a728dc64d 100644 --- a/board/bc3450/bc3450.c +++ b/board/bc3450/bc3450.c @@ -104,7 +104,7 @@ static void sdram_start (int hi_addr) */ #if defined(CONFIG_MPC5200) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; @@ -205,7 +205,7 @@ long int initdram (int board_type) #elif defined(CONFIG_MGT5100) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/bf533-ezkit/bf533-ezkit.c b/board/bf533-ezkit/bf533-ezkit.c index 738f69c78..583560adb 100644 --- a/board/bf533-ezkit/bf533-ezkit.c +++ b/board/bf533-ezkit/bf533-ezkit.c @@ -39,7 +39,7 @@ int checkboard(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { #ifdef DEBUG int brate; diff --git a/board/bf533-stamp/bf533-stamp.c b/board/bf533-stamp/bf533-stamp.c index c4dde92c1..7a17dfa55 100644 --- a/board/bf533-stamp/bf533-stamp.c +++ b/board/bf533-stamp/bf533-stamp.c @@ -48,7 +48,7 @@ int checkboard(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { #ifdef DEBUG printf("SDRAM attributes:\n"); diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c index e714177d7..cd7a04dbf 100644 --- a/board/bf537-stamp/bf537-stamp.c +++ b/board/bf537-stamp/bf537-stamp.c @@ -97,7 +97,7 @@ void cf_outsw(unsigned short *addr, unsigned short *sect_buf, int words) } #endif /* CONFIG_BFIN_IDE */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { #ifdef DEBUG int brate; diff --git a/board/bf561-ezkit/bf561-ezkit.c b/board/bf561-ezkit/bf561-ezkit.c index d504217a1..7345b42cb 100644 --- a/board/bf561-ezkit/bf561-ezkit.c +++ b/board/bf561-ezkit/bf561-ezkit.c @@ -39,7 +39,7 @@ int checkboard(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { #ifdef DEBUG int brate; diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c index 485e050b1..043143163 100644 --- a/board/bmw/bmw.c +++ b/board/bmw/bmw.c @@ -51,7 +51,7 @@ int checkboard(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return 64*1024*1024; } diff --git a/board/c2mon/c2mon.c b/board/c2mon/c2mon.c index ca8eb0cb0..7d2f746f4 100644 --- a/board/c2mon/c2mon.c +++ b/board/c2mon/c2mon.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/canmb/canmb.c b/board/canmb/canmb.c index 1782b314f..d3711d077 100644 --- a/board/canmb/canmb.c +++ b/board/canmb/canmb.c @@ -82,7 +82,7 @@ static void sdram_start (int hi_addr) */ #if defined(CONFIG_MPC5200) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; @@ -185,7 +185,7 @@ long int initdram (int board_type) #elif defined(CONFIG_MGT5100) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index 79fb71dc7..3e952d869 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -114,7 +114,7 @@ static mem_conf_t* get_mem_config(int board_type) /* * Initalize SDRAM - configure SDRAM controller, detect memory size. */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/cmi/cmi.c b/board/cmi/cmi.c index cbf34f785..8501cae21 100644 --- a/board/cmi/cmi.c +++ b/board/cmi/cmi.c @@ -62,7 +62,7 @@ int checkboard(void) /* * 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. */ } diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c index 86c7ee1ee..b92855050 100644 --- a/board/cobra5272/cobra5272.c +++ b/board/cobra5272/cobra5272.c @@ -32,7 +32,7 @@ int checkboard (void) return 0; }; -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile sdramctrl_t *sdp = (sdramctrl_t *) (MMAP_SDRAM); diff --git a/board/cogent/mb.c b/board/cogent/mb.c index 917132b3f..619aea3c0 100644 --- a/board/cogent/mb.c +++ b/board/cogent/mb.c @@ -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 return (32L * 1024L * 1024L); diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c index 79eb47317..f4e867ce7 100644 --- a/board/cpc45/cpc45.c +++ b/board/cpc45/cpc45.c @@ -61,7 +61,7 @@ int checkboard(void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { int m, row, col, bank, i, ref; unsigned long start, end; diff --git a/board/cpu86/cpu86.c b/board/cpu86/cpu86.c index 0eb94efda..9e76c72d3 100644 --- a/board/cpu86/cpu86.c +++ b/board/cpu86/cpu86.c @@ -273,7 +273,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, return (size); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/cpu87/cpu87.c b/board/cpu87/cpu87.c index a2fd19398..f5a5de5d8 100644 --- a/board/cpu87/cpu87.c +++ b/board/cpu87/cpu87.c @@ -274,7 +274,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, return (size); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index a72ba4620..f0dfa07fd 100644 --- a/board/cray/L1/L1.c +++ b/board/cray/L1/L1.c @@ -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); } diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c index 640412d10..5a585ae37 100644 --- a/board/csb272/csb272.c +++ b/board/csb272/csb272.c @@ -120,7 +120,7 @@ int checkboard(void) * configured by initialization code * */ -long initdram (int board_type) +phys_size_t initdram (int board_type) { ulong tot_size; ulong bank_size; diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c index 1fbf17f94..9dc130efc 100644 --- a/board/csb472/csb472.c +++ b/board/csb472/csb472.c @@ -88,7 +88,7 @@ int checkboard(void) * configured by initialization code * */ -long initdram (int board_type) +phys_size_t initdram (int board_type) { ulong tot_size; ulong bank_size; diff --git a/board/cu824/cu824.c b/board/cu824/cu824.c index 3edd27a3e..ecf632894 100644 --- a/board/cu824/cu824.c +++ b/board/cu824/cu824.c @@ -45,7 +45,7 @@ int checkboard (void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { long size; long new_bank0_end; diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c b/board/dave/PPChameleonEVB/PPChameleonEVB.c index e8302d9fc..c9b288a41 100644 --- a/board/dave/PPChameleonEVB/PPChameleonEVB.c +++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c @@ -203,7 +203,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c index 1be72a2dd..629dc317e 100644 --- a/board/dbau1x00/dbau1x00.c +++ b/board/dbau1x00/dbau1x00.c @@ -27,7 +27,7 @@ #include <asm/mipsregs.h> #include <asm/io.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* Sdram is setup by assembler code */ /* If memory could be changed, we should return the true value here */ diff --git a/board/eXalion/eXalion.c b/board/eXalion/eXalion.c index 2e3f51998..385b498d0 100644 --- a/board/eXalion/eXalion.c +++ b/board/eXalion/eXalion.c @@ -52,7 +52,7 @@ int checkflash (void) return (0); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { int i, cnt; volatile uchar *base = CFG_SDRAM_BASE; diff --git a/board/eltec/bab7xx/bab7xx.c b/board/eltec/bab7xx/bab7xx.c index 555475e4d..af5235237 100644 --- a/board/eltec/bab7xx/bab7xx.c +++ b/board/eltec/bab7xx/bab7xx.c @@ -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); } diff --git a/board/eltec/elppc/elppc.c b/board/eltec/elppc/elppc.c index 108adb13d..1b70605e2 100644 --- a/board/eltec/elppc/elppc.c +++ b/board/eltec/elppc/elppc.c @@ -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); } diff --git a/board/eltec/mhpc/mhpc.c b/board/eltec/mhpc/mhpc.c index 0ffbdf0e5..3666791e9 100644 --- a/board/eltec/mhpc/mhpc.c +++ b/board/eltec/mhpc/mhpc.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/emk/top5200/top5200.c b/board/emk/top5200/top5200.c index ccbd72a79..27886261c 100644 --- a/board/emk/top5200/top5200.c +++ b/board/emk/top5200/top5200.c @@ -32,7 +32,7 @@ * initialize SDRAM/DDRAM controller. * TBD: get data from I2C EEPROM *****************************************************************************/ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/emk/top860/top860.c b/board/emk/top860/top860.c index 84afaaa2b..aca4991f5 100644 --- a/board/emk/top860/top860.c +++ b/board/emk/top860/top860.c @@ -76,7 +76,7 @@ int checkboard (void) /***************************************************************************** * 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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/ep8248/ep8248.c b/board/ep8248/ep8248.c index 69975caa2..4cfb2acc8 100644 --- a/board/ep8248/ep8248.c +++ b/board/ep8248/ep8248.c @@ -208,7 +208,7 @@ int board_early_init_f (void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { vu_char *bcsr = (vu_char *)CFG_BCSR; long int msize = 16L << (bcsr[2] & 3); diff --git a/board/ep8260/ep8260.c b/board/ep8260/ep8260.c index b9e1df43d..0e43c6df9 100644 --- a/board/ep8260/ep8260.c +++ b/board/ep8260/ep8260.c @@ -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 memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/ep82xxm/ep82xxm.c b/board/ep82xxm/ep82xxm.c index 27443d3df..03baf0b59 100644 --- a/board/ep82xxm/ep82xxm.c +++ b/board/ep82xxm/ep82xxm.c @@ -219,7 +219,7 @@ int board_early_init_f (void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* Size in MB of SDRAM populated on board*/ long int msize = 256; diff --git a/board/ep88x/ep88x.c b/board/ep88x/ep88x.c index 5f57f36bb..92e5f0c12 100644 --- a/board/ep88x/ep88x.c +++ b/board/ep88x/ep88x.c @@ -86,7 +86,7 @@ int board_early_init_f (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long int msize; volatile immap_t *immap = (volatile immap_t *)CFG_IMMR; diff --git a/board/eric/eric.c b/board/eric/eric.c index 14ba9b0a4..972d485b5 100644 --- a/board/eric/eric.c +++ b/board/eric/eric.c @@ -121,7 +121,7 @@ int checkboard (void) */ /* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { #ifndef CONFIG_ERIC int i; diff --git a/board/esd/adciop/adciop.c b/board/esd/adciop/adciop.c index 7a11a12ce..0f655b78a 100644 --- a/board/esd/adciop/adciop.c +++ b/board/esd/adciop/adciop.c @@ -79,7 +79,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (16 * 1024 * 1024); } diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index 2cb743ef4..83657c8d5 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -423,7 +423,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c index 8a5b03bce..25360a656 100644 --- a/board/esd/ash405/ash405.c +++ b/board/esd/ash405/ash405.c @@ -207,7 +207,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/cms700/cms700.c b/board/esd/cms700/cms700.c index 3d4f2371d..ba27c030b 100644 --- a/board/esd/cms700/cms700.c +++ b/board/esd/cms700/cms700.c @@ -141,7 +141,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/cpci2dp/cpci2dp.c b/board/esd/cpci2dp/cpci2dp.c index 36bf329f8..54de0b806 100644 --- a/board/esd/cpci2dp/cpci2dp.c +++ b/board/esd/cpci2dp/cpci2dp.c @@ -117,7 +117,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c index 69cb8cef5..b856705ff 100644 --- a/board/esd/cpci405/cpci405.c +++ b/board/esd/cpci405/cpci405.c @@ -495,7 +495,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/cpci5200/cpci5200.c b/board/esd/cpci5200/cpci5200.c index adb8597e1..20130acfe 100644 --- a/board/esd/cpci5200/cpci5200.c +++ b/board/esd/cpci5200/cpci5200.c @@ -84,7 +84,7 @@ static void sdram_start(int hi_addr) * is something else than 0x00000000. */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { ulong dramsize = 0; ulong test1, test2; diff --git a/board/esd/cpci750/sdram_init.c b/board/esd/cpci750/sdram_init.c index f43e83f49..a479f0f5f 100644 --- a/board/esd/cpci750/sdram_init.c +++ b/board/esd/cpci750/sdram_init.c @@ -1602,7 +1602,7 @@ dram_size(long int *base, long int maxsize) /* ppcboot interface function to SDRAM init - this is where all the * controlling logic happens */ -long int +phys_size_t initdram(int board_type) { int s0 = 0, s1 = 0; diff --git a/board/esd/cpciiser4/cpciiser4.c b/board/esd/cpciiser4/cpciiser4.c index fcb8cbbe7..204117edf 100644 --- a/board/esd/cpciiser4/cpciiser4.c +++ b/board/esd/cpciiser4/cpciiser4.c @@ -186,7 +186,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (16 * 1024 * 1024); } diff --git a/board/esd/dasa_sim/dasa_sim.c b/board/esd/dasa_sim/dasa_sim.c index 2f8ab1a47..fb0c77e56 100644 --- a/board/esd/dasa_sim/dasa_sim.c +++ b/board/esd/dasa_sim/dasa_sim.c @@ -206,7 +206,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (16 * 1024 * 1024); } diff --git a/board/esd/dp405/dp405.c b/board/esd/dp405/dp405.c index 240ab78aa..bb3baa477 100644 --- a/board/esd/dp405/dp405.c +++ b/board/esd/dp405/dp405.c @@ -122,7 +122,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/du405/du405.c b/board/esd/du405/du405.c index 69432138d..78ae4ba67 100644 --- a/board/esd/du405/du405.c +++ b/board/esd/du405/du405.c @@ -200,7 +200,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (16 * 1024 * 1024); } diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c index 279d9214e..802491a31 100644 --- a/board/esd/hh405/hh405.c +++ b/board/esd/hh405/hh405.c @@ -644,7 +644,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/hub405/hub405.c b/board/esd/hub405/hub405.c index 25c8068fd..03b87c9df 100644 --- a/board/esd/hub405/hub405.c +++ b/board/esd/hub405/hub405.c @@ -229,7 +229,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/mecp5200/mecp5200.c b/board/esd/mecp5200/mecp5200.c index ea49f264a..6d776b7a6 100644 --- a/board/esd/mecp5200/mecp5200.c +++ b/board/esd/mecp5200/mecp5200.c @@ -84,7 +84,7 @@ static void sdram_start(int hi_addr) * is something else than 0x00000000. */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { ulong dramsize = 0; ulong test1, test2; diff --git a/board/esd/ocrtc/ocrtc.c b/board/esd/ocrtc/ocrtc.c index 261b8a54d..7b0edd595 100644 --- a/board/esd/ocrtc/ocrtc.c +++ b/board/esd/ocrtc/ocrtc.c @@ -101,7 +101,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c index c4ab07200..f740d595b 100644 --- a/board/esd/pci405/pci405.c +++ b/board/esd/pci405/pci405.c @@ -358,7 +358,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/pf5200/pf5200.c b/board/esd/pf5200/pf5200.c index 48b80bfc5..7970f8988 100644 --- a/board/esd/pf5200/pf5200.c +++ b/board/esd/pf5200/pf5200.c @@ -84,7 +84,7 @@ static void sdram_start(int hi_addr) * is something else than 0x00000000. */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { ulong dramsize = 0; ulong test1, test2; diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index 57762b54e..fc71e9a2a 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -232,7 +232,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/pmc405/pmc405.c b/board/esd/pmc405/pmc405.c index 7499671aa..326d56035 100644 --- a/board/esd/pmc405/pmc405.c +++ b/board/esd/pmc405/pmc405.c @@ -157,7 +157,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/pmc440/sdram.c b/board/esd/pmc440/sdram.c index 624c45791..c7294c994 100644 --- a/board/esd/pmc440/sdram.c +++ b/board/esd/pmc440/sdram.c @@ -50,7 +50,7 @@ extern void denali_core_search_data_eye(void); * 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_SPL) diff --git a/board/esd/tasreg/tasreg.c b/board/esd/tasreg/tasreg.c index 16724005b..fabb7464f 100644 --- a/board/esd/tasreg/tasreg.c +++ b/board/esd/tasreg/tasreg.c @@ -77,7 +77,7 @@ int checkboard (void) { }; -long int initdram (int board_type) { +phys_size_t initdram (int board_type) { unsigned long junk = 0xa5a59696; /* diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c index 87a584979..52534220a 100644 --- a/board/esd/voh405/voh405.c +++ b/board/esd/voh405/voh405.c @@ -305,7 +305,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/vom405/vom405.c b/board/esd/vom405/vom405.c index 8be552e2e..af8efcff3 100644 --- a/board/esd/vom405/vom405.c +++ b/board/esd/vom405/vom405.c @@ -129,7 +129,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esd/wuh405/wuh405.c b/board/esd/wuh405/wuh405.c index dba3ce888..0590fc78f 100644 --- a/board/esd/wuh405/wuh405.c +++ b/board/esd/wuh405/wuh405.c @@ -205,7 +205,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long val; diff --git a/board/esteem192e/esteem192e.c b/board/esteem192e/esteem192e.c index 3959eead2..f3c8662cd 100644 --- a/board/esteem192e/esteem192e.c +++ b/board/esteem192e/esteem192e.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/etin/debris/debris.c b/board/etin/debris/debris.c index 67375e9fe..763760fd2 100644 --- a/board/etin/debris/debris.c +++ b/board/etin/debris/debris.c @@ -53,7 +53,7 @@ int checkflash (void) } #endif -long int initdram (int board_type) +phys_size_t initdram (int board_type) { int m, row, col, bank, i; unsigned long start, end; diff --git a/board/etin/kvme080/kvme080.c b/board/etin/kvme080/kvme080.c index de62fa097..bfd6854c5 100644 --- a/board/etin/kvme080/kvme080.c +++ b/board/etin/kvme080/kvme080.c @@ -93,7 +93,7 @@ unsigned long setdram(int m, int row, int col, int bank) return (1 << (col + row + 3) ) * bank * m; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { unsigned int msr; long int size = 0; diff --git a/board/etx094/etx094.c b/board/etx094/etx094.c index eb58b5d52..7806519e3 100644 --- a/board/etx094/etx094.c +++ b/board/etx094/etx094.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/evb64260/sdram_init.c b/board/evb64260/sdram_init.c index fae6d1090..9ae446544 100644 --- a/board/evb64260/sdram_init.c +++ b/board/evb64260/sdram_init.c @@ -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 * controlling logic happens */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong checkbank[4] = {[0 ... 3] = 0 }; int bank_no; diff --git a/board/exbitgen/exbitgen.c b/board/exbitgen/exbitgen.c index 49031cfce..0b08a39f9 100644 --- a/board/exbitgen/exbitgen.c +++ b/board/exbitgen/exbitgen.c @@ -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. * Remarks : Size is determined by reading SDRAM configuration registers as diff --git a/board/fads/fads.c b/board/fads/fads.c index 8f5736b41..9e601df1b 100644 --- a/board/fads/fads.c +++ b/board/fads/fads.c @@ -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 base = 0; /* base of dram in bytes */ diff --git a/board/flagadm/flagadm.c b/board/flagadm/flagadm.c index 9c553676e..7caedc99a 100644 --- a/board/flagadm/flagadm.c +++ b/board/flagadm/flagadm.c @@ -96,7 +96,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *)CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/freescale/m52277evb/m52277evb.c b/board/freescale/m52277evb/m52277evb.c index 98424c898..e5f47d2d9 100644 --- a/board/freescale/m52277evb/m52277evb.c +++ b/board/freescale/m52277evb/m52277evb.c @@ -36,7 +36,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile sdramc_t *sdram = (volatile sdramc_t *)(MMAP_SDRAM); u32 dramsize, i; diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c index 585854cd9..c2c8fe859 100644 --- a/board/freescale/m5235evb/m5235evb.c +++ b/board/freescale/m5235evb/m5235evb.c @@ -37,7 +37,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM); volatile gpio_t *gpio = (volatile gpio_t *)(MMAP_GPIO); diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c index e8f621ba3..c9ed341bb 100644 --- a/board/freescale/m5249evb/m5249evb.c +++ b/board/freescale/m5249evb/m5249evb.c @@ -49,7 +49,7 @@ int checkboard (void) { }; -long int initdram (int board_type) { +phys_size_t initdram (int board_type) { unsigned long junk = 0xa5a59696; /* diff --git a/board/freescale/m5253evbe/m5253evbe.c b/board/freescale/m5253evbe/m5253evbe.c index 43aa84de2..f80a47c7b 100644 --- a/board/freescale/m5253evbe/m5253evbe.c +++ b/board/freescale/m5253evbe/m5253evbe.c @@ -34,7 +34,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { int i; diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c index a1b290293..be19e0275 100644 --- a/board/freescale/m5275evb/m5275evb.c +++ b/board/freescale/m5275evb/m5275evb.c @@ -36,7 +36,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile sdramctrl_t *sdp = (sdramctrl_t *)(MMAP_SDRAM); volatile gpio_t *gpio_reg = (gpio_t *)(MMAP_GPIO); diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c index 242eb1a18..f9fa9fb9c 100644 --- a/board/freescale/m5329evb/m5329evb.c +++ b/board/freescale/m5329evb/m5329evb.c @@ -37,7 +37,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM); u32 dramsize, i; diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c index 26b87b99f..a269ee6d4 100644 --- a/board/freescale/m5373evb/m5373evb.c +++ b/board/freescale/m5373evb/m5373evb.c @@ -37,7 +37,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM); u32 dramsize, i; diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c index 6a0278252..0480b5468 100644 --- a/board/freescale/m54455evb/m54455evb.c +++ b/board/freescale/m54455evb/m54455evb.c @@ -37,7 +37,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile sdramc_t *sdram = (volatile sdramc_t *)(MMAP_SDRAM); volatile gpio_t *gpio = (volatile gpio_t *)(MMAP_GPIO); diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c index 539da78de..6d7d27090 100644 --- a/board/freescale/m547xevb/m547xevb.c +++ b/board/freescale/m547xevb/m547xevb.c @@ -38,7 +38,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile siu_t *siu = (siu_t *) (MMAP_SIU); volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM); diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c index 037280748..e6510c955 100644 --- a/board/freescale/m548xevb/m548xevb.c +++ b/board/freescale/m548xevb/m548xevb.c @@ -38,7 +38,7 @@ int checkboard(void) return 0; }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile siu_t *siu = (siu_t *) (MMAP_SIU); volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM); diff --git a/board/freescale/mpc7448hpc2/mpc7448hpc2.c b/board/freescale/mpc7448hpc2/mpc7448hpc2.c index f6cd192a8..b3d83cc19 100644 --- a/board/freescale/mpc7448hpc2/mpc7448hpc2.c +++ b/board/freescale/mpc7448hpc2/mpc7448hpc2.c @@ -81,7 +81,7 @@ long int dram_size (int board_type) return 0x20000000; /* 256M bytes */ } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return dram_size (board_type); } diff --git a/board/freescale/mpc8260ads/mpc8260ads.c b/board/freescale/mpc8260ads/mpc8260ads.c index 548d813af..6f683f031 100644 --- a/board/freescale/mpc8260ads/mpc8260ads.c +++ b/board/freescale/mpc8260ads/mpc8260ads.c @@ -304,7 +304,7 @@ int board_early_init_f (void) #define ns2clk(ns) (ns / (1000000000 / CONFIG_8260_CLKIN) + 1) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { #if CONFIG_ADSTYPE == CFG_PQ2FADS long int msize = 32; diff --git a/board/freescale/mpc8266ads/mpc8266ads.c b/board/freescale/mpc8266ads/mpc8266ads.c index 8f7273c41..090a53413 100644 --- a/board/freescale/mpc8266ads/mpc8266ads.c +++ b/board/freescale/mpc8266ads/mpc8266ads.c @@ -251,7 +251,7 @@ int checkboard(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* Autoinit part stolen from board/sacsng/sacsng.c */ volatile immap_t *immap = (immap_t *)CFG_IMMR; diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c index 16ec4bbf5..afd8b9d5e 100644 --- a/board/freescale/mpc8313erdb/sdram.c +++ b/board/freescale/mpc8313erdb/sdram.c @@ -104,7 +104,7 @@ static long fixed_sdram(void) return msize; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (volatile immap_t *)CFG_IMMR; volatile lbus83xx_t *lbc = &im->lbus; diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c index f97e3c780..07e6486ee 100644 --- a/board/freescale/mpc8315erdb/sdram.c +++ b/board/freescale/mpc8315erdb/sdram.c @@ -101,7 +101,7 @@ static long fixed_sdram(void) return msize; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (volatile immap_t *)CFG_IMMR; u32 msize; diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index afc0eee3b..f5220abdb 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -73,7 +73,7 @@ int board_early_init_f(void) int fixed_sdram(void); -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize = 0; diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c index c10b30f24..4ad6e9d45 100644 --- a/board/freescale/mpc832xemds/mpc832xemds.c +++ b/board/freescale/mpc832xemds/mpc832xemds.c @@ -94,7 +94,7 @@ int board_early_init_r(void) int fixed_sdram(void); -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize = 0; diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c index e18e68e8c..4d57fafc9 100644 --- a/board/freescale/mpc8349emds/mpc8349emds.c +++ b/board/freescale/mpc8349emds/mpc8349emds.c @@ -59,7 +59,7 @@ int board_early_init_f (void) #define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *im = (immap_t *)CFG_IMMR; u32 msize = 0; diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c index 0317bfe6d..d3fc560df 100644 --- a/board/freescale/mpc8349itx/mpc8349itx.c +++ b/board/freescale/mpc8349itx/mpc8349itx.c @@ -128,7 +128,7 @@ volatile static struct pci_controller hose[] = { }; #endif /* CONFIG_PCI */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize = 0; diff --git a/board/freescale/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c index 2119320da..5c3b5dbc9 100644 --- a/board/freescale/mpc8360emds/mpc8360emds.c +++ b/board/freescale/mpc8360emds/mpc8360emds.c @@ -122,7 +122,7 @@ extern void ddr_enable_ecc(unsigned int dram_size); int fixed_sdram(void); void sdram_init(void); -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize = 0; diff --git a/board/freescale/mpc8360erdk/mpc8360erdk.c b/board/freescale/mpc8360erdk/mpc8360erdk.c index 3bcdda733..61d700014 100644 --- a/board/freescale/mpc8360erdk/mpc8360erdk.c +++ b/board/freescale/mpc8360erdk/mpc8360erdk.c @@ -266,7 +266,7 @@ int fixed_sdram(void) return msize; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRC) extern void ddr_enable_ecc(unsigned int dram_size); diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 40a505b1d..40f1e6328 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -75,7 +75,7 @@ extern void ddr_enable_ecc(unsigned int dram_size); #endif int fixed_sdram(void); -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize = 0; diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index f73fd5aa5..aaefc1899 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -64,7 +64,7 @@ void ddr_enable_ecc(unsigned int dram_size); #endif int fixed_sdram(void); -long int initdram(int board_type) +phys_size_t initdram(int board_type) { immap_t *im = (immap_t *) CFG_IMMR; u32 msize = 0; diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c index 051f98570..4f068cc88 100644 --- a/board/freescale/mpc8540ads/mpc8540ads.c +++ b/board/freescale/mpc8540ads/mpc8540ads.c @@ -61,7 +61,7 @@ int checkboard (void) } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index 420a89ab1..3669ba95d 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -240,7 +240,7 @@ int checkboard (void) return 0; } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 5041426ed..f615b2384 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -59,7 +59,7 @@ int checkboard (void) return 0; } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index ad29734b2..0b037cc69 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -88,7 +88,7 @@ int checkboard (void) return 0; } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index 74e20cb23..9a65101dd 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -238,7 +238,7 @@ int checkboard (void) return 0; } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c index 144b58480..2c14a880e 100644 --- a/board/freescale/mpc8560ads/mpc8560ads.c +++ b/board/freescale/mpc8560ads/mpc8560ads.c @@ -264,7 +264,7 @@ int checkboard (void) } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index f1928abf9..2ccff7d81 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -140,7 +140,7 @@ int checkboard (void) return 0; } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index ce563dc67..c85f373c1 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -113,7 +113,7 @@ int checkboard(void) } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 915fb58ee..cf540fc65 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -53,7 +53,7 @@ int checkboard(void) } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/funkwerk/vovpn-gw/vovpn-gw.c b/board/funkwerk/vovpn-gw/vovpn-gw.c index 9b5429afa..1c3f627a4 100644 --- a/board/funkwerk/vovpn-gw/vovpn-gw.c +++ b/board/funkwerk/vovpn-gw/vovpn-gw.c @@ -318,7 +318,7 @@ do_reset (void *cmdtp, int flag, int argc, char *argv[]) #define ns2clk(ns) (ns / (1000000000 / CONFIG_8260_CLKIN) + 1) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { #ifndef CFG_RAMBOOT volatile immap_t *immap; diff --git a/board/g2000/g2000.c b/board/g2000/g2000.c index 9fcab7484..647f4b705 100644 --- a/board/g2000/g2000.c +++ b/board/g2000/g2000.c @@ -131,7 +131,7 @@ long int init_sdram_static_settings(void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long int ret; diff --git a/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c b/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c index d99b45523..105a74714 100644 --- a/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c +++ b/board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c @@ -22,7 +22,7 @@ #include <config.h> #include <asm/leon.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return 1; } diff --git a/board/gaisler/gr_ep2s60/gr_ep2s60.c b/board/gaisler/gr_ep2s60/gr_ep2s60.c index e8617f075..2904d3258 100644 --- a/board/gaisler/gr_ep2s60/gr_ep2s60.c +++ b/board/gaisler/gr_ep2s60/gr_ep2s60.c @@ -22,7 +22,7 @@ #include <config.h> #include <asm/leon.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return 1; } diff --git a/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c b/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c index 1ee702481..fc8cf84f9 100644 --- a/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c +++ b/board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c @@ -22,7 +22,7 @@ #include <config.h> #include <asm/leon.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return 1; } diff --git a/board/gaisler/grsim/grsim.c b/board/gaisler/grsim/grsim.c index 70a2f23c5..deccd3d0e 100644 --- a/board/gaisler/grsim/grsim.c +++ b/board/gaisler/grsim/grsim.c @@ -26,7 +26,7 @@ #include <common.h> #include <asm/leon.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return 1; } diff --git a/board/gaisler/grsim_leon2/grsim_leon2.c b/board/gaisler/grsim_leon2/grsim_leon2.c index 55dfe8286..61445fe25 100644 --- a/board/gaisler/grsim_leon2/grsim_leon2.c +++ b/board/gaisler/grsim_leon2/grsim_leon2.c @@ -26,7 +26,7 @@ #include <common.h> #include <asm/leon.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return 1; } diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c index 73cc16d47..e3d0e435d 100644 --- a/board/gen860t/gen860t.c +++ b/board/gen860t/gen860t.c @@ -158,7 +158,7 @@ int checkboard (void) /* * Initialize SDRAM */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immr = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immr->im_memctl; diff --git a/board/genietv/genietv.c b/board/genietv/genietv.c index c75507f61..fc2116967 100644 --- a/board/genietv/genietv.c +++ b/board/genietv/genietv.c @@ -118,7 +118,7 @@ static void PrintState (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *im = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &im->im_memctl; diff --git a/board/gth/gth.c b/board/gth/gth.c index b1fcbf5cc..788a6a094 100644 --- a/board/gth/gth.c +++ b/board/gth/gth.c @@ -265,7 +265,7 @@ int initsdram (uint base, uint * noMbytes) #endif } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { u32 *i; u32 j; diff --git a/board/gth2/gth2.c b/board/gth2/gth2.c index 3e56678c0..cea65c677 100644 --- a/board/gth2/gth2.c +++ b/board/gth2/gth2.c @@ -83,7 +83,7 @@ void hw_watchdog_reset(void){ } } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* Sdram is setup by assembler code */ /* If memory could be changed, we should return the true value here */ diff --git a/board/gw8260/gw8260.c b/board/gw8260/gw8260.c index 2719a9585..42c9e0d10 100644 --- a/board/gw8260/gw8260.c +++ b/board/gw8260/gw8260.c @@ -606,7 +606,7 @@ int testdram (void) /* */ /* */ /*********************************************************************/ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/hermes/hermes.c b/board/hermes/hermes.c index 8fd081fef..f9b57204f 100644 --- a/board/hermes/hermes.c +++ b/board/hermes/hermes.c @@ -134,7 +134,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/hidden_dragon/hidden_dragon.c b/board/hidden_dragon/hidden_dragon.c index daab8334e..5713a3384 100644 --- a/board/hidden_dragon/hidden_dragon.c +++ b/board/hidden_dragon/hidden_dragon.c @@ -44,7 +44,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long size; long new_bank0_end; diff --git a/board/hmi1001/hmi1001.c b/board/hmi1001/hmi1001.c index 8bdfe78e4..8cfd75bd8 100644 --- a/board/hmi1001/hmi1001.c +++ b/board/hmi1001/hmi1001.c @@ -80,7 +80,7 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c index 13e60e222..91aaab1b0 100644 --- a/board/hymod/hymod.c +++ b/board/hymod/hymod.c @@ -364,7 +364,7 @@ misc_init_f (void) /* ------------------------------------------------------------------------- */ -long +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index 07ba2459d..760db7368 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -134,7 +134,7 @@ static void sdram_start (int hi_addr) */ #if defined(CONFIG_MPC5200) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; @@ -259,7 +259,7 @@ long int initdram (int board_type) #elif defined(CONFIG_MGT5100) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/icu862/icu862.c b/board/icu862/icu862.c index 8da9d1c9a..18aa8bf6d 100644 --- a/board/icu862/icu862.c +++ b/board/icu862/icu862.c @@ -94,7 +94,7 @@ static long int dram_size (long int, long int *, long int); /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/idmr/idmr.c b/board/idmr/idmr.c index 081c37533..4f073fc31 100644 --- a/board/idmr/idmr.c +++ b/board/idmr/idmr.c @@ -29,7 +29,7 @@ int checkboard (void) { return 0; }; -long int initdram (int board_type) { +phys_size_t initdram (int board_type) { int i; /* diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c index 7176770f6..8ec4cd717 100644 --- a/board/ids8247/ids8247.c +++ b/board/ids8247/ids8247.c @@ -276,7 +276,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, return (size); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c index dc513739f..ac7ad8f29 100644 --- a/board/incaip/incaip.c +++ b/board/incaip/incaip.c @@ -53,7 +53,7 @@ static ulong max_sdram_size(void) return size; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { int rows, cols, best_val = *INCA_IP_SDRAM_MC_CFGPB0; ulong size, max_size = 0; diff --git a/board/inka4x0/inka4x0.c b/board/inka4x0/inka4x0.c index 46074e464..a2e35ff0f 100644 --- a/board/inka4x0/inka4x0.c +++ b/board/inka4x0/inka4x0.c @@ -92,7 +92,7 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/ip860/ip860.c b/board/ip860/ip860.c index 9dd809b67..375cd4d26 100644 --- a/board/ip860/ip860.c +++ b/board/ip860/ip860.c @@ -137,7 +137,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/iphase4539/iphase4539.c b/board/iphase4539/iphase4539.c index 0ca9cf513..e5d0254a1 100644 --- a/board/iphase4539/iphase4539.c +++ b/board/iphase4539/iphase4539.c @@ -193,7 +193,7 @@ const iop_conf_t iop_conf_tab[4][32] = { } }; -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/ispan/ispan.c b/board/ispan/ispan.c index d39b8cd53..12fb91fb8 100644 --- a/board/ispan/ispan.c +++ b/board/ispan/ispan.c @@ -356,7 +356,7 @@ static int hwc_board_type (char **str) return id; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long maxsize = hwc_main_sdram_size(); diff --git a/board/ivm/ivm.c b/board/ivm/ivm.c index 7927ea9a5..4882f0450 100644 --- a/board/ivm/ivm.c +++ b/board/ivm/ivm.c @@ -159,7 +159,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immr = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immr->im_memctl; diff --git a/board/jse/sdram.c b/board/jse/sdram.c index 9060d979d..8ba6c454f 100644 --- a/board/jse/sdram.c +++ b/board/jse/sdram.c @@ -30,7 +30,7 @@ * in lib_ppc/board.c to initialize the memory and return what I * found. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { /* Configure the SDRAMS */ diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c index efdc33349..7913c7537 100644 --- a/board/jupiter/jupiter.c +++ b/board/jupiter/jupiter.c @@ -92,7 +92,7 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; diff --git a/board/kup/kup4k/kup4k.c b/board/kup/kup4k/kup4k.c index 4e377a142..66d618072 100644 --- a/board/kup/kup4k/kup4k.c +++ b/board/kup/kup4k/kup4k.c @@ -137,7 +137,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/kup/kup4x/kup4x.c b/board/kup/kup4x/kup4x.c index cd9ed13d6..f07ef1870 100644 --- a/board/kup/kup4x/kup4x.c +++ b/board/kup/kup4x/kup4x.c @@ -134,7 +134,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/lantec/lantec.c b/board/lantec/lantec.c index 417dbbb05..46f4da9e6 100644 --- a/board/lantec/lantec.c +++ b/board/lantec/lantec.c @@ -109,7 +109,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/linkstation/linkstation.c b/board/linkstation/linkstation.c index f6bc0a958..241cf032d 100644 --- a/board/linkstation/linkstation.c +++ b/board/linkstation/linkstation.c @@ -50,7 +50,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE)); } diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c index c68978aa9..4a2d8e4a4 100644 --- a/board/lwmon/lwmon.c +++ b/board/lwmon/lwmon.c @@ -192,7 +192,7 @@ int checkboard (void) } /*********************************************************************** -F* Function: long int initdram (int board_type) P*A*Z* +F* Function: phys_size_t initdram (int board_type) P*A*Z* * P* Parameters: int board_type P* - Usually type of the board - ignored here. @@ -209,7 +209,7 @@ D* Design: wd@denx.de C* Coding: wd@denx.de V* Verification: dzu@denx.de ***********************************************************************/ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immr = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immr->im_memctl; diff --git a/board/lwmon5/sdram.c b/board/lwmon5/sdram.c index 36b51007e..0a1383115 100644 --- a/board/lwmon5/sdram.c +++ b/board/lwmon5/sdram.c @@ -158,7 +158,7 @@ static void program_ecc(u32 start_address, * initdram -- 440EPx's DDR controller is a DENALI Core * ************************************************************************/ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { #if 0 /* test-only: will remove this define later, when ECC problems are solved! */ /* CL=3 */ diff --git a/board/m5271evb/m5271evb.c b/board/m5271evb/m5271evb.c index 9caad6325..e089d5f02 100644 --- a/board/m5271evb/m5271evb.c +++ b/board/m5271evb/m5271evb.c @@ -29,7 +29,7 @@ int checkboard (void) { return 0; }; -long int initdram (int board_type) { +phys_size_t initdram (int board_type) { int i; diff --git a/board/m5272c3/m5272c3.c b/board/m5272c3/m5272c3.c index 6dcda4f25..d17cb2ef9 100644 --- a/board/m5272c3/m5272c3.c +++ b/board/m5272c3/m5272c3.c @@ -31,7 +31,7 @@ int checkboard (void) { return 0; }; -long int initdram (int board_type) { +phys_size_t initdram (int board_type) { volatile sdramctrl_t * sdp = (sdramctrl_t *)(MMAP_SDRAM); sdp->sdram_sdtr = 0xf539; diff --git a/board/m5282evb/m5282evb.c b/board/m5282evb/m5282evb.c index 7d6d1d623..50e5e7736 100644 --- a/board/m5282evb/m5282evb.c +++ b/board/m5282evb/m5282evb.c @@ -32,7 +32,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { u32 dramsize, i, dramclk; diff --git a/board/mbx8xx/mbx8xx.c b/board/mbx8xx/mbx8xx.c index 9a9bf809e..414d87919 100644 --- a/board/mbx8xx/mbx8xx.c +++ b/board/mbx8xx/mbx8xx.c @@ -304,7 +304,7 @@ static ulong get_ramsize (dimm_t * dimm) return size; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c index a4c4644b4..77ee3d7ed 100644 --- a/board/mcc200/mcc200.c +++ b/board/mcc200/mcc200.c @@ -96,7 +96,7 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; diff --git a/board/mgcoge/mgcoge.c b/board/mgcoge/mgcoge.c index e7c3fa00c..89ced1eca 100644 --- a/board/mgcoge/mgcoge.c +++ b/board/mgcoge/mgcoge.c @@ -249,7 +249,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, return (size); } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/mgsuvd/mgsuvd.c b/board/mgsuvd/mgsuvd.c index e0123bfa5..d81cafbb4 100644 --- a/board/mgsuvd/mgsuvd.c +++ b/board/mgsuvd/mgsuvd.c @@ -66,7 +66,7 @@ int checkboard (void) return (0); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/ml2/ml2.c b/board/ml2/ml2.c index f32e512d4..981e1decd 100644 --- a/board/ml2/ml2.c +++ b/board/ml2/ml2.c @@ -53,7 +53,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return 32 * 1024 * 1024; } diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c index 68257b861..3b3406222 100644 --- a/board/motionpro/motionpro.c +++ b/board/motionpro/motionpro.c @@ -132,7 +132,7 @@ static void sdram_start(int hi_addr) /* * Initalize SDRAM - configure SDRAM controller, detect memory size. */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/mousse/mousse.c b/board/mousse/mousse.c index 7208a17c1..f8f152976 100644 --- a/board/mousse/mousse.c +++ b/board/mousse/mousse.c @@ -55,7 +55,7 @@ int checkflash (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return CFG_RAM_SIZE; } diff --git a/board/mpc8540eval/mpc8540eval.c b/board/mpc8540eval/mpc8540eval.c index 8328b3a06..1ac333c81 100644 --- a/board/mpc8540eval/mpc8540eval.c +++ b/board/mpc8540eval/mpc8540eval.c @@ -61,7 +61,7 @@ int checkboard (void) return (0); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c index 9e8f9bbdd..cf0afd1ad 100644 --- a/board/mpl/mip405/mip405.c +++ b/board/mpl/mip405/mip405.c @@ -620,7 +620,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ static int test_dram (unsigned long ramsize); -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long bank_reg[4], tmp, bank_size; diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c index 7893d61f1..475741d2a 100644 --- a/board/mpl/pati/pati.c +++ b/board/mpl/pati/pati.c @@ -149,7 +149,7 @@ extern void mem_test_reloc(void); /* * Get RAM size. */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { unsigned char board_rev; unsigned long reg; diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c index 38286081a..6cba892e7 100644 --- a/board/mpl/pip405/pip405.c +++ b/board/mpl/pip405/pip405.c @@ -608,7 +608,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ static int test_dram (unsigned long ramsize); -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned long bank_reg[4], tmp, bank_size; int i, ds; diff --git a/board/munices/munices.c b/board/munices/munices.c index 395909d7c..162f89c50 100644 --- a/board/munices/munices.c +++ b/board/munices/munices.c @@ -74,7 +74,7 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; diff --git a/board/musenki/musenki.c b/board/musenki/musenki.c index 4408b07c5..b2b70e756 100644 --- a/board/musenki/musenki.c +++ b/board/musenki/musenki.c @@ -45,7 +45,7 @@ int checkflash (void) } #endif -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long size; long new_bank0_end; diff --git a/board/mvblm7/mvblm7.c b/board/mvblm7/mvblm7.c index c02c59ce8..41cb39dc9 100644 --- a/board/mvblm7/mvblm7.c +++ b/board/mvblm7/mvblm7.c @@ -73,7 +73,7 @@ int fixed_sdram(void) return CFG_DDR_SIZE; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *im = (immap_t *) CFG_IMMR; u32 msize = 0; diff --git a/board/mvblue/mvblue.c b/board/mvblue/mvblue.c index ee8f3e301..a979102ab 100644 --- a/board/mvblue/mvblue.c +++ b/board/mvblue/mvblue.c @@ -76,7 +76,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long size; long new_bank0_end; diff --git a/board/mvs1/mvs1.c b/board/mvs1/mvs1.c index f8a8cb757..58b84f5ae 100644 --- a/board/mvs1/mvs1.c +++ b/board/mvs1/mvs1.c @@ -136,7 +136,7 @@ static void test_dram (unsigned long *start, unsigned long *end) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/nc650/nc650.c b/board/nc650/nc650.c index 707e4b97d..657abc46d 100644 --- a/board/nc650/nc650.c +++ b/board/nc650/nc650.c @@ -128,7 +128,7 @@ static long int dram_size (long int, long int *, long int); /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/netphone/netphone.c b/board/netphone/netphone.c index 1072b3f88..38eb7c811 100644 --- a/board/netphone/netphone.c +++ b/board/netphone/netphone.c @@ -404,7 +404,7 @@ void check_ram(unsigned int addr, unsigned int size) } } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index 42c7c16cd..c14474182 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -154,7 +154,7 @@ int misc_init_r(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { long dram_size = 0; u16 boardVersReg = in_be16((u16 *)HCU_MACH_VERSIONS_REGISTER); diff --git a/board/netstal/hcu5/sdram.c b/board/netstal/hcu5/sdram.c index d8817b831..80e84aebb 100644 --- a/board/netstal/hcu5/sdram.c +++ b/board/netstal/hcu5/sdram.c @@ -199,7 +199,7 @@ static void program_ecc(unsigned long start_address, unsigned long num_bytes) * initdram -- 440EPx's DDR controller is a DENALI Core * ************************************************************************/ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned int dram_size = 0; diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index 07891f678..ed171bfeb 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -161,7 +161,7 @@ int misc_init_r(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { unsigned int dram_size = 64*1024*1024; init_ppc405_sdram(dram_size); diff --git a/board/netta/netta.c b/board/netta/netta.c index 5a75e53e0..1183f33ef 100644 --- a/board/netta/netta.c +++ b/board/netta/netta.c @@ -337,7 +337,7 @@ void check_ram(unsigned int addr, unsigned int size) } } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/netta2/netta2.c b/board/netta2/netta2.c index b216c5a8e..a97c14cee 100644 --- a/board/netta2/netta2.c +++ b/board/netta2/netta2.c @@ -402,7 +402,7 @@ void check_ram(unsigned int addr, unsigned int size) } } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/netvia/netvia.c b/board/netvia/netvia.c index 856b7769c..4140bac86 100644 --- a/board/netvia/netvia.c +++ b/board/netvia/netvia.c @@ -245,7 +245,7 @@ int checkboard(void) #define MCR_MCLF(x) ((unsigned long)((x) & 15) << (31 - 23)) #define MCR_MCLF_MASK MCR_MCLF(15) -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/nx823/nx823.c b/board/nx823/nx823.c index 4a426ec49..18840ff48 100644 --- a/board/nx823/nx823.c +++ b/board/nx823/nx823.c @@ -157,7 +157,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/o2dnt/o2dnt.c b/board/o2dnt/o2dnt.c index 81a27002f..a4eed3a43 100644 --- a/board/o2dnt/o2dnt.c +++ b/board/o2dnt/o2dnt.c @@ -67,7 +67,7 @@ static void sdram_start (int hi_addr) * use of CFG_SDRAM_BASE. The code does not work if CFG_SDRAM_BASE * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; diff --git a/board/oxc/oxc.c b/board/oxc/oxc.c index 6cc3cc5a3..b61d39951 100644 --- a/board/oxc/oxc.c +++ b/board/oxc/oxc.c @@ -34,7 +34,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { #ifndef CFG_RAMBOOT long size; diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c index 82b723520..82e2613e2 100644 --- a/board/pb1x00/pb1x00.c +++ b/board/pb1x00/pb1x00.c @@ -27,7 +27,7 @@ #include <asm/mipsregs.h> #include <asm/io.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* Sdram is setup by assembler code */ /* If memory could be changed, we should return the true value here */ diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c index 1148c6aa2..c1917c11b 100644 --- a/board/pcippc2/pcippc2.c +++ b/board/pcippc2/pcippc2.c @@ -63,7 +63,7 @@ u32 pcippc2_sdram_size (void) return in32 (REG (CPC0, RGBAN1)); } -long initdram (int board_type) +phys_size_t initdram (int board_type) { return cpc710_ram_init (); } diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index 2b8992ec1..f66f3f233 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -537,7 +537,7 @@ void spd_ddr_init_hang (void) } } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/pm520/pm520.c b/board/pm520/pm520.c index 14c3f1d44..83d9bcd02 100644 --- a/board/pm520/pm520.c +++ b/board/pm520/pm520.c @@ -84,7 +84,7 @@ static void sdram_start (int hi_addr) */ #if defined(CONFIG_MPC5200) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; @@ -187,7 +187,7 @@ long int initdram (int board_type) #elif defined(CONFIG_MGT5100) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/pm826/pm826.c b/board/pm826/pm826.c index 1420e649d..7ee3ab65c 100644 --- a/board/pm826/pm826.c +++ b/board/pm826/pm826.c @@ -279,7 +279,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/pm828/pm828.c b/board/pm828/pm828.c index 98cd80bc8..6038e9758 100644 --- a/board/pm828/pm828.c +++ b/board/pm828/pm828.c @@ -312,7 +312,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/pm854/pm854.c b/board/pm854/pm854.c index 5d3252573..555f6c0ca 100644 --- a/board/pm854/pm854.c +++ b/board/pm854/pm854.c @@ -71,7 +71,7 @@ int checkboard (void) } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/pm856/pm856.c b/board/pm856/pm856.c index 6386abcd3..bf325f89e 100644 --- a/board/pm856/pm856.c +++ b/board/pm856/pm856.c @@ -225,7 +225,7 @@ int checkboard (void) } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/pn62/pn62.c b/board/pn62/pn62.c index b2f348d4d..d905b2965 100644 --- a/board/pn62/pn62.c +++ b/board/pn62/pn62.c @@ -75,7 +75,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long size; long new_bank0_end; diff --git a/board/ppmc7xx/ppmc7xx.c b/board/ppmc7xx/ppmc7xx.c index 402ac5e20..061e01ec4 100644 --- a/board/ppmc7xx/ppmc7xx.c +++ b/board/ppmc7xx/ppmc7xx.c @@ -29,7 +29,7 @@ extern void _start_warm(void); * the SDRAM was already initialised by board_asm_init (see init.S) so we just * return the size of RAM. */ -long initdram( int board_type ) +phys_size_t initdram( int board_type ) { return CFG_SDRAM_SIZE; } diff --git a/board/ppmc8260/ppmc8260.c b/board/ppmc8260/ppmc8260.c index 2b20c26f1..f3c85096b 100644 --- a/board/ppmc8260/ppmc8260.c +++ b/board/ppmc8260/ppmc8260.c @@ -199,7 +199,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 memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/prodrive/p3mx/sdram_init.c b/board/prodrive/p3mx/sdram_init.c index 046486042..d881d3807 100644 --- a/board/prodrive/p3mx/sdram_init.c +++ b/board/prodrive/p3mx/sdram_init.c @@ -160,7 +160,7 @@ long int dram_size (long int *base, long int maxsize) #define SDRAM_NOP 0x5 #define SDRAM_SELF_REFRESH 0x7 -long int initdram (int board_type) +phys_size_t initdram (int board_type) { int tmp; int start; diff --git a/board/psyent/pci5441/pci5441.c b/board/psyent/pci5441/pci5441.c index ea80dd139..0afef6f96 100644 --- a/board/psyent/pci5441/pci5441.c +++ b/board/psyent/pci5441/pci5441.c @@ -34,7 +34,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/psyent/pk1c20/pk1c20.c b/board/psyent/pk1c20/pk1c20.c index 1924ae3d1..95b48bc57 100644 --- a/board/psyent/pk1c20/pk1c20.c +++ b/board/psyent/pk1c20/pk1c20.c @@ -34,7 +34,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/purple/purple.c b/board/purple/purple.c index 72d573442..977559112 100644 --- a/board/purple/purple.c +++ b/board/purple/purple.c @@ -124,7 +124,7 @@ static void sdram_timing_init (ulong size) } } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* The only supported number of SDRAM banks is 4. */ diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c index 6e6eab277..7a69a00f9 100644 --- a/board/qemu-mips/qemu-mips.c +++ b/board/qemu-mips/qemu-mips.c @@ -26,7 +26,7 @@ #include <asm/mipsregs.h> #include <asm/io.h> -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* Sdram is setup by assembler code */ /* If memory could be changed, we should return the true value here */ diff --git a/board/quad100hd/quad100hd.c b/board/quad100hd/quad100hd.c index 638bd6ca2..81186782b 100644 --- a/board/quad100hd/quad100hd.c +++ b/board/quad100hd/quad100hd.c @@ -87,7 +87,7 @@ int checkboard(void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return CFG_SDRAM_SIZE; } diff --git a/board/quantum/quantum.c b/board/quantum/quantum.c index afa6e113d..345f127b6 100644 --- a/board/quantum/quantum.c +++ b/board/quantum/quantum.c @@ -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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/r360mpi/r360mpi.c b/board/r360mpi/r360mpi.c index ffb4c0ecf..c51e412f4 100644 --- a/board/r360mpi/r360mpi.c +++ b/board/r360mpi/r360mpi.c @@ -103,7 +103,7 @@ static long int dram_size (long int, long int *, long int); /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/rattler/rattler.c b/board/rattler/rattler.c index be7977dec..ad75c2156 100644 --- a/board/rattler/rattler.c +++ b/board/rattler/rattler.c @@ -185,7 +185,7 @@ const iop_conf_t iop_conf_tab[4][32] = { } }; -long int initdram(int board_type) +phys_size_t initdram(int board_type) { long int msize = CFG_SDRAM_SIZE; diff --git a/board/rbc823/rbc823.c b/board/rbc823/rbc823.c index 9e60c2b64..5b62af614 100644 --- a/board/rbc823/rbc823.c +++ b/board/rbc823/rbc823.c @@ -142,7 +142,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/rmu/rmu.c b/board/rmu/rmu.c index 8cb03c7f8..e22dc5258 100644 --- a/board/rmu/rmu.c +++ b/board/rmu/rmu.c @@ -92,7 +92,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/rpxsuper/rpxsuper.c b/board/rpxsuper/rpxsuper.c index b4331f1cd..f633c5c47 100644 --- a/board/rpxsuper/rpxsuper.c +++ b/board/rpxsuper/rpxsuper.c @@ -225,7 +225,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 memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/rsdproto/rsdproto.c b/board/rsdproto/rsdproto.c index 312d4b860..eeec3b4dc 100644 --- a/board/rsdproto/rsdproto.c +++ b/board/rsdproto/rsdproto.c @@ -282,7 +282,7 @@ int misc_init_f (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/sacsng/sacsng.c b/board/sacsng/sacsng.c index e85a0fc4d..ecbe0211e 100644 --- a/board/sacsng/sacsng.c +++ b/board/sacsng/sacsng.c @@ -159,7 +159,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 memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/sandburst/common/sb_common.c b/board/sandburst/common/sb_common.c index 8a831fa35..51b1c7514 100644 --- a/board/sandburst/common/sb_common.c +++ b/board/sandburst/common/sb_common.c @@ -200,7 +200,7 @@ void sbcommon_fans(void) * Initialize sdram * ************************************************************************/ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/sandpoint/sandpoint.c b/board/sandpoint/sandpoint.c index aeb10a743..7429647b8 100644 --- a/board/sandpoint/sandpoint.c +++ b/board/sandpoint/sandpoint.c @@ -50,7 +50,7 @@ int checkflash (void) } #endif -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long size; long new_bank0_end; diff --git a/board/sbc405/sbc405.c b/board/sbc405/sbc405.c index 0ae6d0ba4..7818cd7e5 100644 --- a/board/sbc405/sbc405.c +++ b/board/sbc405/sbc405.c @@ -96,7 +96,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return spd_sdram (); } diff --git a/board/sbc8240/sbc8240.c b/board/sbc8240/sbc8240.c index 8a52f6741..175720d90 100644 --- a/board/sbc8240/sbc8240.c +++ b/board/sbc8240/sbc8240.c @@ -45,7 +45,7 @@ int checkboard (void) return 0; } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { long size; long new_bank0_end; diff --git a/board/sbc8260/sbc8260.c b/board/sbc8260/sbc8260.c index 48aefa010..5781f6281 100644 --- a/board/sbc8260/sbc8260.c +++ b/board/sbc8260/sbc8260.c @@ -208,7 +208,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 memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c index e89b6e824..4a44fda31 100644 --- a/board/sbc8349/sbc8349.c +++ b/board/sbc8349/sbc8349.c @@ -52,7 +52,7 @@ int board_early_init_f (void) #define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *im = (immap_t *)CFG_IMMR; u32 msize = 0; diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 9c8c6733f..91b40e59f 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -81,7 +81,7 @@ int checkboard (void) return 0; } -long int +phys_size_t initdram(int board_type) { long dram_size = 0; diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c index 8df4f3a97..2946ca105 100644 --- a/board/sbc8560/sbc8560.c +++ b/board/sbc8560/sbc8560.c @@ -257,7 +257,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index 519f33278..c724effa0 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -57,7 +57,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/sc3/sc3.c b/board/sc3/sc3.c index fbdc1d769..3d1a6542d 100644 --- a/board/sc3/sc3.c +++ b/board/sc3/sc3.c @@ -579,7 +579,7 @@ static int printSDRAMConfig(char reg, unsigned long cr) static unsigned int mbcf[] = {mem_mb0cf, mem_mb1cf, mem_mb2cf, mem_mb3cf}; #endif -long int initdram (int board_type) +phys_size_t initdram (int board_type) { unsigned int mems=0; unsigned long ul1; diff --git a/board/siemens/CCM/ccm.c b/board/siemens/CCM/ccm.c index 5a32e45e2..d65376328 100644 --- a/board/siemens/CCM/ccm.c +++ b/board/siemens/CCM/ccm.c @@ -155,7 +155,7 @@ static void init_leds (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *)CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/siemens/IAD210/IAD210.c b/board/siemens/IAD210/IAD210.c index e498937b6..9c0ff0278 100644 --- a/board/siemens/IAD210/IAD210.c +++ b/board/siemens/IAD210/IAD210.c @@ -100,7 +100,7 @@ const uint sdram_table[] = { /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/siemens/SCM/scm.c b/board/siemens/SCM/scm.c index 8783aafe9..6a9dd2583 100644 --- a/board/siemens/SCM/scm.c +++ b/board/siemens/SCM/scm.c @@ -306,7 +306,7 @@ int power_on_reset (void) return gd->reset_status & RSR_CSRS ? 0 : 1; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c index 2309069a6..5647f7af0 100644 --- a/board/siemens/pcu_e/pcu_e.c +++ b/board/siemens/pcu_e/pcu_e.c @@ -156,7 +156,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immr = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immr->im_memctl; diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index 798e1855b..dcd34726b 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -496,7 +496,7 @@ const uint sdram_table[] = /* ------------------------------------------------------------------------- */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *immap = (immap_t *)CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/sl8245/sl8245.c b/board/sl8245/sl8245.c index 593eb4ee8..86478871b 100644 --- a/board/sl8245/sl8245.c +++ b/board/sl8245/sl8245.c @@ -34,7 +34,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { #ifndef CFG_RAMBOOT long size; diff --git a/board/snmc/qs850/qs850.c b/board/snmc/qs850/qs850.c index 637f1250e..ba5a8fb0a 100644 --- a/board/snmc/qs850/qs850.c +++ b/board/snmc/qs850/qs850.c @@ -143,7 +143,7 @@ int checkboard (void) #define REFRESH_INIT_LOOPS (0) -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *)CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/snmc/qs860t/qs860t.c b/board/snmc/qs860t/qs860t.c index a11d86301..17c935621 100644 --- a/board/snmc/qs860t/qs860t.c +++ b/board/snmc/qs860t/qs860t.c @@ -115,7 +115,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c index 329eaccd5..768fe05a2 100644 --- a/board/socrates/sdram.c +++ b/board/socrates/sdram.c @@ -76,7 +76,7 @@ long int sdram_setup(int casl) } #endif -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; #if defined(CONFIG_SPD_EEPROM) diff --git a/board/sorcery/sorcery.c b/board/sorcery/sorcery.c index 165e9e299..2b789d474 100644 --- a/board/sorcery/sorcery.c +++ b/board/sorcery/sorcery.c @@ -27,7 +27,7 @@ #include <asm/mmu.h> #include <pci.h> -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong size; diff --git a/board/spc1920/spc1920.c b/board/spc1920/spc1920.c index 1f5dcb5d3..a32aad0ee 100644 --- a/board/spc1920/spc1920.c +++ b/board/spc1920/spc1920.c @@ -82,7 +82,7 @@ const uint sdram_table[] = { _NOT_USED_, _NOT_USED_, _NOT_USED_, }; -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immr = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immr->im_memctl; diff --git a/board/spd8xx/spd8xx.c b/board/spd8xx/spd8xx.c index c79b9b0dd..6387f8a65 100644 --- a/board/spd8xx/spd8xx.c +++ b/board/spd8xx/spd8xx.c @@ -143,7 +143,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/ssv/adnpesc1/adnpesc1.c b/board/ssv/adnpesc1/adnpesc1.c index 3ee8ba588..71de20899 100644 --- a/board/ssv/adnpesc1/adnpesc1.c +++ b/board/ssv/adnpesc1/adnpesc1.c @@ -57,7 +57,7 @@ int checkboard (void) return 0; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return (0); } diff --git a/board/stxgp3/stxgp3.c b/board/stxgp3/stxgp3.c index f04ffa804..218e8053f 100644 --- a/board/stxgp3/stxgp3.c +++ b/board/stxgp3/stxgp3.c @@ -275,7 +275,7 @@ show_activity(int flag) next_led_update += (get_tbclk() / 4); } -long int +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 08177e1ae..2c4b54642 100644 --- a/board/stxssa/stxssa.c +++ b/board/stxssa/stxssa.c @@ -291,7 +291,7 @@ show_activity(int flag) next_led_update += (get_tbclk() / 4); } -long int +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/stxxtc/stxxtc.c b/board/stxxtc/stxxtc.c index 87a202276..a75037439 100644 --- a/board/stxxtc/stxxtc.c +++ b/board/stxxtc/stxxtc.c @@ -399,7 +399,7 @@ void check_ram(unsigned int addr, unsigned int size) #define DO_LOOP do { for (;;) asm volatile ("nop" : : : "memory"); } while(0) -long int initdram(int board_type) +phys_size_t initdram(int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/svm_sc8xx/svm_sc8xx.c b/board/svm_sc8xx/svm_sc8xx.c index b900e6bd1..06fb18b34 100644 --- a/board/svm_sc8xx/svm_sc8xx.c +++ b/board/svm_sc8xx/svm_sc8xx.c @@ -100,7 +100,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/tb0229/tb0229.c b/board/tb0229/tb0229.c index d08b42245..921bd3adc 100644 --- a/board/tb0229/tb0229.c +++ b/board/tb0229/tb0229.c @@ -32,7 +32,7 @@ void pci_init_board (void) } #endif -long int initdram(int board_type) +phys_size_t initdram(int board_type) { return get_ram_size (CFG_SDRAM_BASE, 0x8000000); } diff --git a/board/total5200/total5200.c b/board/total5200/total5200.c index c8d4c6710..868ebd5f5 100644 --- a/board/total5200/total5200.c +++ b/board/total5200/total5200.c @@ -36,7 +36,7 @@ #include "mt48lc16m16a2-75.h" #endif -long int initdram (int board_type) +phys_size_t initdram (int board_type) { sdram_conf_t sdram_conf; diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c index f9891dbb7..8b8e46137 100644 --- a/board/tqc/tqm5200/tqm5200.c +++ b/board/tqc/tqm5200/tqm5200.c @@ -104,7 +104,7 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; diff --git a/board/tqc/tqm8260/tqm8260.c b/board/tqc/tqm8260/tqm8260.c index 736c410ed..f201045d9 100644 --- a/board/tqc/tqm8260/tqm8260.c +++ b/board/tqc/tqm8260/tqm8260.c @@ -283,7 +283,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, return (size); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/tqc/tqm8272/tqm8272.c b/board/tqc/tqm8272/tqm8272.c index ec1a37c7f..29099f5ed 100644 --- a/board/tqc/tqm8272/tqm8272.c +++ b/board/tqc/tqm8272/tqm8272.c @@ -555,7 +555,7 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, return (size); } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c index aea985ccc..278780dde 100644 --- a/board/tqc/tqm834x/tqm834x.c +++ b/board/tqc/tqm834x/tqm834x.c @@ -85,7 +85,7 @@ int board_early_init_r (void) { /************************************************************************** * DRAM initalization and size detection */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long bank_size; long size; diff --git a/board/tqc/tqm85xx/sdram.c b/board/tqc/tqm85xx/sdram.c index 442ff667c..33bc4077e 100644 --- a/board/tqc/tqm85xx/sdram.c +++ b/board/tqc/tqm85xx/sdram.c @@ -286,7 +286,7 @@ void board_add_ram_info (int use_default) } } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; int casl; diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c index 18bf2a830..96b6103fc 100644 --- a/board/tqc/tqm8xx/tqm8xx.c +++ b/board/tqc/tqm8xx/tqm8xx.c @@ -139,7 +139,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/uc100/uc100.c b/board/uc100/uc100.c index a5dd95d78..896f9693e 100644 --- a/board/uc100/uc100.c +++ b/board/uc100/uc100.c @@ -169,7 +169,7 @@ int checkboard (void) /* * Initialize SDRAM */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/uc101/uc101.c b/board/uc101/uc101.c index f72651396..69ba5078d 100644 --- a/board/uc101/uc101.c +++ b/board/uc101/uc101.c @@ -146,7 +146,7 @@ static void sdram_start (int hi_addr) * is something else than 0x00000000. */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { ulong dramsize = 0; #ifndef CFG_RAMBOOT diff --git a/board/utx8245/utx8245.c b/board/utx8245/utx8245.c index 834fd8407..e2a961a3a 100644 --- a/board/utx8245/utx8245.c +++ b/board/utx8245/utx8245.c @@ -46,7 +46,7 @@ int checkboard(void) } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { long size; long new_bank0_end; diff --git a/board/v37/v37.c b/board/v37/v37.c index 2e4757302..2067fedfc 100644 --- a/board/v37/v37.c +++ b/board/v37/v37.c @@ -90,7 +90,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 memctl8xx_t *memctl = &immap->im_memctl; diff --git a/board/v38b/v38b.c b/board/v38b/v38b.c index ec032eef8..8815a0cb4 100644 --- a/board/v38b/v38b.c +++ b/board/v38b/v38b.c @@ -71,7 +71,7 @@ static void sdram_start(int hi_addr) #endif /* !CFG_RAMBOOT */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { ulong dramsize = 0; ulong dramsize2 = 0; diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c index 7a3d63a4b..0e3b84c61 100644 --- a/board/w7o/w7o.c +++ b/board/w7o/w7o.c @@ -152,7 +152,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -long int initdram (int board_type) +phys_size_t initdram (int board_type) { /* * ToDo: Move the asm init routine sdram_init() to this C file, diff --git a/board/westel/amx860/amx860.c b/board/westel/amx860/amx860.c index 8826667cd..4742aafc5 100644 --- a/board/westel/amx860/amx860.c +++ b/board/westel/amx860/amx860.c @@ -61,7 +61,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; diff --git a/board/xilinx/ml300/ml300.c b/board/xilinx/ml300/ml300.c index 58bfac071..5d493eeb7 100644 --- a/board/xilinx/ml300/ml300.c +++ b/board/xilinx/ml300/ml300.c @@ -79,7 +79,7 @@ checkboard(void) return (0); } -long int +phys_size_t initdram(int board_type) { return 128 * 1024 * 1024; diff --git a/board/xpedite1k/xpedite1k.c b/board/xpedite1k/xpedite1k.c index 8411cf06f..bc7e3bd17 100644 --- a/board/xpedite1k/xpedite1k.c +++ b/board/xpedite1k/xpedite1k.c @@ -104,7 +104,7 @@ int checkboard (void) } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { long dram_size = 0; diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c index 1239ea0bd..0113d4845 100644 --- a/board/zeus/zeus.c +++ b/board/zeus/zeus.c @@ -208,7 +208,7 @@ static u32 detect_sdram_size(void) return size; } -long int initdram (int board_type) +phys_size_t initdram (int board_type) { return detect_sdram_size(); } diff --git a/board/zpc1900/zpc1900.c b/board/zpc1900/zpc1900.c index 7db535e8a..103ef714f 100644 --- a/board/zpc1900/zpc1900.c +++ b/board/zpc1900/zpc1900.c @@ -220,7 +220,7 @@ void nvram_write(long dest, const void *src, size_t count) } #endif /* CFG_NVRAM_ACCESS_ROUTINE */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { vu_char *bcsr = (vu_char *)CFG_BCSR; volatile immap_t *immap = (immap_t *)CFG_IMMR; diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/cpu/ppc4xx/44x_spd_ddr2.c index 521491820..c28fc463b 100644 --- a/cpu/ppc4xx/44x_spd_ddr2.c +++ b/cpu/ppc4xx/44x_spd_ddr2.c @@ -389,7 +389,7 @@ static unsigned long sdram_memsize(void) * banks appropriately. If Auto Memory Configuration is * not used, it is assumed that no DIMM is plugged *-----------------------------------------------------------------------------*/ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { unsigned char iic0_dimm_addr[] = SPD_EEPROM_ADDRESS; unsigned char spd0[MAX_SPD_BYTES]; @@ -3081,7 +3081,7 @@ static void ppc440sp_sdram_register_dump(void) * banks. The configuration is performed using static, compile- * time parameters. *---------------------------------------------------------------------------*/ -long initdram(int board_type) +phys_size_t initdram(int board_type) { /* * Only run this SDRAM init code once. For NAND booting diff --git a/cpu/ppc4xx/denali_spd_ddr2.c b/cpu/ppc4xx/denali_spd_ddr2.c index ad805b937..3bd637567 100644 --- a/cpu/ppc4xx/denali_spd_ddr2.c +++ b/cpu/ppc4xx/denali_spd_ddr2.c @@ -1022,7 +1022,7 @@ static void program_ddr0_44(unsigned long dimm_ranks[], * banks appropriately. If Auto Memory Configuration is * not used, it is assumed that no DIMM is plugged *-----------------------------------------------------------------------------*/ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { unsigned char const iic0_dimm_addr[] = SPD_EEPROM_ADDRESS; unsigned long dimm_ranks[MAXDIMMS]; diff --git a/cpu/ppc4xx/sdram.c b/cpu/ppc4xx/sdram.c index c7771adda..7d60ad667 100644 --- a/cpu/ppc4xx/sdram.c +++ b/cpu/ppc4xx/sdram.c @@ -164,7 +164,7 @@ static ulong compute_rtr(ulong speed, ulong rows, ulong refresh) /* * Autodetect onboard SDRAM on 405 platforms */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { ulong speed; ulong sdtr1; @@ -346,7 +346,7 @@ static void sdram_tr1_set(int ram_address, int* tr1_value) * so this should be extended for other future boards * using this routine! */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { int i; int tr1_bank1; diff --git a/include/common.h b/include/common.h index 8fa339db7..fd5adb3d6 100644 --- a/include/common.h +++ b/include/common.h @@ -202,7 +202,7 @@ int serial_buffered_tstc (void); void hang (void) __attribute__ ((noreturn)); /* */ -long int initdram (int); +phys_size_t initdram (int); int display_options (void); void print_size (phys_size_t, const char *); int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen); diff --git a/nand_spl/board/amcc/bamboo/sdram.c b/nand_spl/board/amcc/bamboo/sdram.c index ca25252ed..adede44c3 100644 --- a/nand_spl/board/amcc/bamboo/sdram.c +++ b/nand_spl/board/amcc/bamboo/sdram.c @@ -36,7 +36,7 @@ static void wait_init_complete(void) } /* - * long int initdram(int board_type) + * phys_size_t initdram(int board_type) * * As the name already indicates, this function is called very early * from start.S and configures the SDRAM with fixed values. This is needed, @@ -51,7 +51,7 @@ static void wait_init_complete(void) * modules are still plugged in. So it is recommended to remove the DIMM * modules while using the NAND booting code with the fixed SDRAM setup! */ -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* * Soft-reset SDRAM controller. diff --git a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c index 9010fca15..29d7d3f81 100644 --- a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c +++ b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c @@ -35,7 +35,7 @@ static void wait_init_complete(void) } while (!(val & 0x80000000)); } -long int initdram(int board_type) +phys_size_t initdram(int board_type) { /* * Reset the DDR-SDRAM controller. |