summaryrefslogtreecommitdiffstats
path: root/nand_spl
diff options
context:
space:
mode:
authorBecky Bruce <becky.bruce@freescale.com>2008-06-09 16:03:40 -0500
committerWolfgang Denk <wd@denx.de>2008-06-12 08:50:18 +0200
commit9973e3c614721bbf169882ffc3be266a6611cd60 (patch)
tree01ca6844089d2ea999566aa558acea50a9e606a1 /nand_spl
parent391fd93ab23e15ab3dd58a54f5b609024009c378 (diff)
downloadblackbird-obmc-uboot-9973e3c614721bbf169882ffc3be266a6611cd60.tar.gz
blackbird-obmc-uboot-9973e3c614721bbf169882ffc3be266a6611cd60.zip
Change initdram() return type to phys_size_t
This patch changes the return type of initdram() from long int to phys_size_t. This is required for a couple of reasons: long int limits the amount of dram to 2GB, and u-boot in general is moving over to phys_size_t to represent the size of physical memory. phys_size_t is defined as an unsigned long on almost all current platforms. This patch *only* changes the return type of the initdram function (in include/common.h, as well as in each board's implementation of initdram). It does not actually modify the code inside the function on any of the platforms; platforms which wish to support more than 2GB of DRAM will need to modify their initdram() function code. Build tested with MAKEALL for ppc, arm, mips, mips-el. Booted on powerpc MPC8641HPCN. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Diffstat (limited to 'nand_spl')
-rw-r--r--nand_spl/board/amcc/bamboo/sdram.c4
-rw-r--r--nand_spl/board/amcc/canyonlands/ddr2_fixed.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/nand_spl/board/amcc/bamboo/sdram.c b/nand_spl/board/amcc/bamboo/sdram.c
index ca25252edf..adede44c37 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 9010fca15a..29d7d3f819 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.
OpenPOWER on IntegriCloud