dev_add_partition -> devfs_add_partition

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

11 files changed, 28 insertions, 33 deletions

diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
index 3fe5193b50..66dafd2d0e 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/board/freescale-mx35-3-stack/3stack.c
@@ -94,10 +94,8 @@ static int f3s_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, "self");	/* ourself */
+	devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env");	/* environment */
 
 	armlinux_set_bootparams((void *)0x80000100);
 	armlinux_set_architecture(MACH_TYPE_PCM037); /* FIXME */
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index f1b635dbe0..57c99dfd7e 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -135,8 +135,8 @@ static int mx27ads_devices_init(void)
 	register_device(&sdram_dev);
 	register_device(&fec_dev);
 
-	dev_add_partition(&cfi_dev, 0x00000, 0x20000, PARTITION_FIXED, "self");
-	dev_add_partition(&cfi_dev, 0x20000, 0x20000, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x20000, 0x20000, PARTITION_FIXED, "env");
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
 	armlinux_set_bootparams((void *)0xa0000100);
diff --git a/board/ipe337/ipe337.c b/board/ipe337/ipe337.c
index 1a910e5e43..6d479fcd37 100644
--- a/board/ipe337/ipe337.c
+++ b/board/ipe337/ipe337.c
@@ -41,10 +41,10 @@ static int ipe337_devices_init(void) {
 	*pFIO0_FLAG_S = (1<<12);
 
 	register_device(&smc911x_dev);
-#ifdef CONFIG_PARTITION
-	dev_add_partition(&cfi_dev, 0x00000, 0x20000, PARTITION_FIXED, "self");
-	dev_add_partition(&cfi_dev, 0x20000, 0x20000, PARTITION_FIXED, "env");
-#endif
+
+	devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x20000, 0x20000, PARTITION_FIXED, "env");
+
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
 	return 0;
diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.c b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
index a169608279..db47f7159d 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c
+++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
@@ -121,8 +121,8 @@ static int mcfv4e_devices_init(void)
 	 * Create partitions that should be
 	 * not touched by any regular user
 	 */
-	dev_add_partition(&cfi_dev, 0x00000, 0x80000, PARTITION_FIXED, "self");	/* ourself */
-	dev_add_partition(&cfi_dev, 0x80000, 0x40000, PARTITION_FIXED, "env");	/* environment */
+	devfs_add_partition("nor0", 0x00000, 0x80000, PARTITION_FIXED, "self");	/* ourself */
+	devfs_add_partition("nor0", 0x80000, 0x40000, PARTITION_FIXED, "env");	/* environment */
 	dev_protect(&cfi_dev, 0xc0000, 0, 2);
 
 	//register_device(&sram_dev);
diff --git a/board/mmccpu/init.c b/board/mmccpu/init.c
index d8f9a5d79e..add1a82d77 100644
--- a/board/mmccpu/init.c
+++ b/board/mmccpu/init.c
@@ -107,8 +107,8 @@ static int mmccpu_devices_init(void)
 	register_device(&macb_dev);
 	register_device(&cfi_dev);
 
-	dev_add_partition(&cfi_dev, 0x00000, 256 * 1024, PARTITION_FIXED, "self");
-	dev_add_partition(&cfi_dev, 0x40000, 128 * 1024, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00000, 256 * 1024, PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x40000, 128 * 1024, PARTITION_FIXED, "env");
 
 	armlinux_set_bootparams((void *)0x20000100);
 	armlinux_set_architecture(MACH_TYPE_MMCCPU);
diff --git a/board/netx/netx.c b/board/netx/netx.c
index 628acee933..3cd137c94c 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -77,12 +77,10 @@ static int netx_devices_init(void) {
 	register_device(&netx_eth_dev0);
 //	register_device(&netx_eth_dev1);
 
-#ifdef CONFIG_PARTITION
-	dev_add_partition(&cfi_dev, 0x00000, 0x40000, PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self");
 
 	/* Do not overwrite primary env for now */
-	dev_add_partition(&cfi_dev, 0xc0000, 0x80000, PARTITION_FIXED, "env"); 
-#endif
+	devfs_add_partition("nor0", 0xc0000, 0x80000, PARTITION_FIXED, "env"); 
 
 	dev_protect(&cfi_dev, 0x40000, 0, 1);
 
diff --git a/board/pcm030/pcm030.c b/board/pcm030/pcm030.c
index 39c3b76d91..df2c4859e0 100644
--- a/board/pcm030/pcm030.c
+++ b/board/pcm030/pcm030.c
@@ -90,8 +90,8 @@ static int devices_init (void)
 	scratch_dev.size = SCRATCHMEM_SIZE;
 	register_device(&scratch_dev);
 
-	dev_add_partition(&cfi_dev, 0x00f00000, 0x40000, PARTITION_FIXED, "self");
-	dev_add_partition(&cfi_dev, 0x00f60000, 0x20000, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00f00000, 0x40000, PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x00f60000, 0x20000, PARTITION_FIXED, "env");
 
 	return 0;
 }
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index 007a0dbad7..2d17b9f6d7 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -101,10 +101,9 @@ static int imx35_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, "self");	/* ourself */
+	devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env");	/* environment */
+
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
 	register_device(&nand_dev);
diff --git a/board/phycard-i.MX27/pca100.c b/board/phycard-i.MX27/pca100.c
index 0468c3a0cb..0362b66913 100644
--- a/board/phycard-i.MX27/pca100.c
+++ b/board/phycard-i.MX27/pca100.c
@@ -75,7 +75,7 @@ static struct device_d nand_dev = {
 static int pca100_devices_init(void)
 {
 	int i;
-	struct device_d *nand, *dev;
+	struct device_d *nand;
 
 	unsigned int mode[] = {
 		PD0_AIN_FEC_TXD0,
@@ -126,11 +126,11 @@ static int pca100_devices_init(void)
 	PCCR1 |= PCCR1_PERCLK2_EN;
 
 	nand = get_device_by_path("/dev/nand0");
-	dev = dev_add_partition(nand, 0x00000, 0x40000, PARTITION_FIXED, "self_raw");
-	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");
-	dev_add_bb_dev(dev, "env0");
+	devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw");
+	dev_add_bb_dev("env_raw", "env0");
 
 	armlinux_set_bootparams((void *)0xa0000100);
 	armlinux_set_architecture(2149);
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c
index 99310a7476..beb6128885 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.c
+++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c
@@ -102,8 +102,8 @@ static int mcfv4e_devices_init(void)
 	 * Create partitions that should be
 	 * not touched by any regular user
 	 */
-	dev_add_partition(&cfi_dev, 0x00000, 0x80000, PARTITION_FIXED, "self");	/* ourself */
-	dev_add_partition(&cfi_dev, 0x80000, 0x40000, PARTITION_FIXED, "env");	/* environment */
+	devfs_add_partition("nor0", 0x00000, 0x80000, PARTITION_FIXED, "self");	/* ourself */
+	devfs_add_partition("nor0", 0x80000, 0x40000, PARTITION_FIXED, "env");	/* environment */
 	dev_protect(&cfi_dev, 0xc0000, 0, 1);
 
 	register_device(&network_dev0);
diff --git a/board/pm9263/init.c b/board/pm9263/init.c
index 90afc0be44..ccc6bffd15 100644
--- a/board/pm9263/init.c
+++ b/board/pm9263/init.c
@@ -98,8 +98,8 @@ static int pm9263_devices_init(void)
 	register_device(&macb_dev);
 	register_device(&cfi_dev);
 
-	dev_add_partition(&cfi_dev, 0x00000, 0x40000, PARTITION_FIXED, "self");
-	dev_add_partition(&cfi_dev, 0x40000, 0x10000, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x40000, 0x10000, PARTITION_FIXED, "env");
 
 	armlinux_set_bootparams((void *)0x20000100);
 	armlinux_set_architecture(MACH_TYPE_PM9263);