summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-12-14 11:07:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-12-15 20:11:35 +0100
commit07fc87d530519360b1f9c7ec7ac7d834b4c48525 (patch)
tree0e4b8c8bf20bbea5f3d8fe7cd78b3f0b4edbf3cd
parent8f69f2ebf2f184e5a1cd59e1df84983ab24808c6 (diff)
downloadbarebox-07fc87d530519360b1f9c7ec7ac7d834b4c48525.tar.gz
barebox-07fc87d530519360b1f9c7ec7ac7d834b4c48525.tar.xz
ppc pcm030: Move memory registration to mem_initcall
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/ppc/boards/pcm030/pcm030.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index 4abf6cba8c..9c6ccb7bc8 100644
--- a/arch/ppc/boards/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
@@ -45,7 +45,6 @@ static struct mpc5xxx_fec_platform_data fec_info = {
static int devices_init (void)
{
- unsigned long sdramsize;
struct stat s;
int ret;
@@ -56,9 +55,6 @@ static int devices_init (void)
mpc5200_setup_cs(MPC5200_BOOTCS, 0xfe000000, SZ_32M, 0x0008fd00);
add_cfi_flash_device(-1, 0xfe000000, 32 * 1024 * 1024, 0);
- sdramsize = mpc5200_get_sdram_size(0) + mpc5200_get_sdram_size(1);
- barebox_add_memory_bank("ram0", 0x0, sdramsize);
-
add_generic_device("fec_mpc5xxx", -1, NULL, MPC5XXX_FEC, 0x200,
IORESOURCE_MEM, &fec_info);
@@ -85,6 +81,18 @@ static int console_init(void)
console_initcall(console_init);
+static int mem_init(void)
+{
+ unsigned long sdramsize;
+
+ sdramsize = mpc5200_get_sdram_size(0) + mpc5200_get_sdram_size(1);
+
+ barebox_add_memory_bank("ram0", 0x0, sdramsize);
+
+ return 0;
+}
+mem_initcall(mem_init);
+
#include "mt46v32m16-75.h"
static void sdram_start (int hi_addr)