register env as env0 and not as env

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

10 files changed, 20 insertions, 20 deletions

diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
index 8801c01e67..84b94f5abc 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/board/freescale-mx35-3-stack/3stack.c
@@ -90,8 +90,8 @@ static int f3s_devices_init(void)
 	 * Create partitions that should be
 	 * not touched by any regular user
 	 */
-	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self");	/* ourself */
-	devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env");	/* environment */
+	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0");	/* ourself */
+	devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0");	/* environment */
 
 	armlinux_add_dram(&sdram_dev);
 	armlinux_set_bootparams((void *)0x80000100);
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index ef92d52b6f..0b1335f375 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -133,8 +133,8 @@ static int mx27ads_devices_init(void)
 	register_device(&sdram_dev);
 	register_device(&fec_dev);
 
-	devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self");
-	devfs_add_partition("nor0", 0x20000, 0x20000, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self0");
+	devfs_add_partition("nor0", 0x20000, 0x20000, PARTITION_FIXED, "env0");
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
 	armlinux_add_dram(&sdram_dev);
diff --git a/board/ipe337/ipe337.c b/board/ipe337/ipe337.c
index b4dab3b45a..c848e6981e 100644
--- a/board/ipe337/ipe337.c
+++ b/board/ipe337/ipe337.c
@@ -40,8 +40,8 @@ static int ipe337_devices_init(void) {
 
 	register_device(&smc911x_dev);
 
-	devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self");
-	devfs_add_partition("nor0", 0x20000, 0x20000, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self0");
+	devfs_add_partition("nor0", 0x20000, 0x20000, PARTITION_FIXED, "env0");
 
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
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 06b3c0bf48..190bae2d3b 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c
+++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
@@ -116,8 +116,8 @@ static int mcfv4e_devices_init(void)
 	 * Create partitions that should be
 	 * not touched by any regular user
 	 */
-	devfs_add_partition("nor0", 0x00000, 0x80000, PARTITION_FIXED, "self");	/* ourself */
-	devfs_add_partition("nor0", 0x80000, 0x40000, PARTITION_FIXED, "env");	/* environment */
+	devfs_add_partition("nor0", 0x00000, 0x80000, PARTITION_FIXED, "self0");	/* ourself */
+	devfs_add_partition("nor0", 0x80000, 0x40000, PARTITION_FIXED, "env0");	/* 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 58edd73c43..665c7d9acb 100644
--- a/board/mmccpu/init.c
+++ b/board/mmccpu/init.c
@@ -105,8 +105,8 @@ static int mmccpu_devices_init(void)
 	register_device(&macb_dev);
 	register_device(&cfi_dev);
 
-	devfs_add_partition("nor0", 0x00000, 256 * 1024, PARTITION_FIXED, "self");
-	devfs_add_partition("nor0", 0x40000, 128 * 1024, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00000, 256 * 1024, PARTITION_FIXED, "self0");
+	devfs_add_partition("nor0", 0x40000, 128 * 1024, PARTITION_FIXED, "env0");
 
 	armlinux_add_dram(&sdram_dev);
 	armlinux_set_bootparams((void *)0x20000100);
diff --git a/board/netx/netx.c b/board/netx/netx.c
index 8af5dee749..afbd43e44b 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -73,10 +73,10 @@ static int netx_devices_init(void) {
 	register_device(&netx_eth_dev0);
 //	register_device(&netx_eth_dev1);
 
-	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self");
+	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0");
 
 	/* Do not overwrite primary env for now */
-	devfs_add_partition("nor0", 0xc0000, 0x80000, PARTITION_FIXED, "env"); 
+	devfs_add_partition("nor0", 0xc0000, 0x80000, PARTITION_FIXED, "env0");
 
 	dev_protect(&cfi_dev, 0x40000, 0, 1);
 
diff --git a/board/pcm030/pcm030.c b/board/pcm030/pcm030.c
index aa41e61a33..c0c9a33a7d 100644
--- a/board/pcm030/pcm030.c
+++ b/board/pcm030/pcm030.c
@@ -76,8 +76,8 @@ static int devices_init (void)
 	register_device(&sdram_dev);
 	register_device(&eth_dev);
 
-	devfs_add_partition("nor0", 0x00f00000, 0x40000, PARTITION_FIXED, "self");
-	devfs_add_partition("nor0", 0x00f60000, 0x20000, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00f00000, 0x40000, PARTITION_FIXED, "self0");
+	devfs_add_partition("nor0", 0x00f60000, 0x20000, PARTITION_FIXED, "env0");
 
 	return 0;
 }
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index 55c6ba31d1..8e0eab4f92 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -100,8 +100,8 @@ static int imx35_devices_init(void)
 	 * Create partitions that should be
 	 * not touched by any regular user
 	 */
-	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self");	/* ourself */
-	devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env");	/* environment */
+	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);
 
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c
index 128515a510..f4816ce47f 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.c
+++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c
@@ -99,8 +99,8 @@ static int mcfv4e_devices_init(void)
 	 * Create partitions that should be
 	 * not touched by any regular user
 	 */
-	devfs_add_partition("nor0", 0x00000, 0x80000, PARTITION_FIXED, "self");	/* ourself */
-	devfs_add_partition("nor0", 0x80000, 0x40000, PARTITION_FIXED, "env");	/* environment */
+	devfs_add_partition("nor0", 0x00000, 0x80000, PARTITION_FIXED, "self0");	/* ourself */
+	devfs_add_partition("nor0", 0x80000, 0x40000, PARTITION_FIXED, "env0");	/* 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 3cdfe7fe38..fb33298f43 100644
--- a/board/pm9263/init.c
+++ b/board/pm9263/init.c
@@ -96,8 +96,8 @@ static int pm9263_devices_init(void)
 	register_device(&macb_dev);
 	register_device(&cfi_dev);
 
-	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self");
-	devfs_add_partition("nor0", 0x40000, 0x10000, PARTITION_FIXED, "env");
+	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0");
+	devfs_add_partition("nor0", 0x40000, 0x10000, PARTITION_FIXED, "env0");
 
 	armlinux_add_dram(&sdram_dev);
 	armlinux_set_bootparams((void *)0x20000100);