diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/pcm037/pcm037.c | 8 | ||||
| -rw-r--r-- | board/pcm038/pcm038.c | 20 | ||||
| -rw-r--r-- | board/scb9328/scb9328.c | 14 |
3 files changed, 20 insertions, 22 deletions
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c index b1691e8fde..b0160b1e11 100644 --- a/board/pcm037/pcm037.c +++ b/board/pcm037/pcm037.c @@ -43,7 +43,6 @@ */ static struct device_d cfi_dev = { .name = "cfi_flash", - .id = "nor0", .map_base = IMX_CS0_BASE, .size = 32 * 1024 * 1024, /* area size */ }; @@ -245,10 +244,9 @@ static int imx31_devices_init(void) * Create partitions that should be * not touched by any regular user */ -#ifdef CONFIG_PARTITION - dev_add_partition(&cfi_dev, 0x00000, 0x40000, PARTITION_FIXED, "self"); /* ourself */ - dev_add_partition(&cfi_dev, 0x40000, 0x20000, PARTITION_FIXED, "env"); /* environment */ -#endif + devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0"); /* ourself */ + devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0"); /* environment */ + dev_protect(&cfi_dev, 0x20000, 0, 1); register_device(&sram_dev); diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c index 2270be7b62..375270b2e1 100644 --- a/board/pcm038/pcm038.c +++ b/board/pcm038/pcm038.c @@ -111,9 +111,9 @@ static struct device_d nand_dev = { static int pcm038_devices_init(void) { - struct device_d *nand, *dev; - char *envdev = "no"; int i; + struct device_d *nand; + char *envdev = "no"; unsigned int mode[] = { PD0_AIN_FEC_TXD0, @@ -192,20 +192,16 @@ static int pcm038_devices_init(void) nand = get_device_by_path("/dev/nand0"); if (!nand) break; - dev = dev_add_partition(nand, 0x00000, 0x40000, PARTITION_FIXED, "self_raw"); - if (!dev) - break; - dev_add_bb_dev(dev, "self0"); + devfs_add_partition("nand0", 0x00000, 0x40000, PARTITION_FIXED, "self_raw"); + dev_add_bb_dev("self_raw", "self0"); - dev = dev_add_partition(nand, 0x40000, 0x20000, PARTITION_FIXED, "env_raw"); - if (!dev) - break; - dev_add_bb_dev(dev, "env0"); + devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw"); + dev_add_bb_dev("env_raw", "env0"); envdev = "NAND"; break; default: - dev_add_partition(&cfi_dev, 0x00000, 0x40000, PARTITION_FIXED, "self"); - dev_add_partition(&cfi_dev, 0x40000, 0x20000, PARTITION_FIXED, "env"); + devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0"); + devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0"); dev_protect(&cfi_dev, 0x40000, 0, 1); envdev = "NOR"; } diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c index 9e54902838..253ca3af31 100644 --- a/board/scb9328/scb9328.c +++ b/board/scb9328/scb9328.c @@ -35,20 +35,24 @@ static struct device_d cfi_dev = { .name = "cfi_flash", - .id = "nor0", .map_base = 0x10000000, .size = 16 * 1024 * 1024, }; +static struct memory_platform_data sdram_pdata = { + .name = "ram0", + .flags = DEVFS_RDWR, +}; + static struct device_d sdram_dev = { - .name = "ram", - .id = "ram0", + .name = "mem", .map_base = 0x08000000, .size = 16 * 1024 * 1024, .type = DEVICE_TYPE_DRAM, + .platform_data = &sdram_pdata, }; static struct dm9000_platform_data dm9000_data = { @@ -93,8 +97,8 @@ static int scb9328_devices_init(void) { register_device(&sdram_dev); register_device(&dm9000_dev); - dev_add_partition(&cfi_dev, 0x00000, 0x20000, PARTITION_FIXED, "self"); - dev_add_partition(&cfi_dev, 0x40000, 0x20000, PARTITION_FIXED, "env"); + devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self0"); + devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0"); dev_protect(&cfi_dev, 0x20000, 0, 1); armlinux_set_bootparams((void *)0x08000100); |