summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <j.beisert@pengutronix.de>2009-08-11 16:46:45 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-08-11 17:08:21 +0200
commitbffd9dd42d90c9bda0a0be461034d91b190d6895 (patch)
treed6b4298f485f8db0c680112ab797a224cf8a39bf
parent9a313a8017cc409e08a5328776835bbf691ed3f2 (diff)
downloadbarebox-bffd9dd42d90c9bda0a0be461034d91b190d6895.tar.gz
barebox-bffd9dd42d90c9bda0a0be461034d91b190d6895.tar.xz
adapt both S3C platforms to the new device handling
Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
-rw-r--r--board/a9m2410/a9m2410.c13
-rw-r--r--board/a9m2440/a9m2440.c13
2 files changed, 20 insertions, 6 deletions
diff --git a/board/a9m2410/a9m2410.c b/board/a9m2410/a9m2410.c
index 3a75edb2c9..ba3004e254 100644
--- a/board/a9m2410/a9m2410.c
+++ b/board/a9m2410/a9m2410.c
@@ -35,9 +35,15 @@
#include <asm/arch/s3c24x0-iomap.h>
#include <asm/arch/s3c24x0-nand.h>
+static struct memory_platform_data ram_pdata = {
+ .name = "ram0",
+ .flags = DEVFS_RDWR,
+};
+
static struct device_d sdram_dev = {
- .name = "ram",
- .map_base = CS6_BASE,
+ .name = "ram",
+ .map_base = CS6_BASE,
+ .platform_data = &ram_pdata,
};
// {"NAND 1MiB 3,3V 8-bit", 0xec, 256, 1, 0x1000, 0},
@@ -154,8 +160,9 @@ static int a9m2410_devices_init(void)
devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw");
dev_add_bb_dev("env_raw", "env0");
#endif
- armlinux_set_bootparams((void *)sdram_dev.map_base + 0x100);
+ armlinux_add_dram(&sdram_dev);
+ armlinux_set_bootparams((void *)sdram_dev.map_base + 0x100);
armlinux_set_architecture(MACH_TYPE_A9M2410);
return 0;
diff --git a/board/a9m2440/a9m2440.c b/board/a9m2440/a9m2440.c
index 18976b7cbb..669efeb576 100644
--- a/board/a9m2440/a9m2440.c
+++ b/board/a9m2440/a9m2440.c
@@ -35,9 +35,15 @@
#include <asm/arch/s3c24x0-iomap.h>
#include <asm/arch/s3c24x0-nand.h>
+static struct memory_platform_data ram_pdata = {
+ .name = "ram0",
+ .flags = DEVFS_RDWR,
+};
+
static struct device_d sdram_dev = {
- .name = "ram",
- .map_base = CS6_BASE,
+ .name = "mem",
+ .map_base = CS6_BASE,
+ .platform_data = &ram_pdata,
};
static struct s3c24x0_nand_platform_data nand_info = {
@@ -162,9 +168,10 @@ static int a9m2440_devices_init(void)
dev_add_bb_dev("self_raw", "self0");
devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw");
+ dev_add_bb_dev("env_raw", "env0");
#endif
+ armlinux_add_dram(&sdram_dev);
armlinux_set_bootparams((void *)sdram_dev.map_base + 0x100);
-
armlinux_set_architecture(MACH_TYPE_A9M2440);
return 0;