diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
index a371f2d9d..3a78c0c42 100644
--- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -127,7 +127,7 @@ static int eukrea_cpuimx27_devices_init(void)
 
 	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);
+	protect_file("/dev/env0", 1);
 	envdev = "NOR";
 
 	printf("Using environment in %s Flash\n", envdev);
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index 0b1335f37..d3524360a 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -135,7 +135,7 @@ static int mx27ads_devices_init(void)
 
 	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);
+	protect_file("/dev/env0", 1);
 
 	armlinux_add_dram(&sdram_dev);
 	armlinux_set_bootparams((void *)0xa0000100);
diff --git a/board/ipe337/ipe337.c b/board/ipe337/ipe337.c
index c848e6981..c9416fec1 100644
--- a/board/ipe337/ipe337.c
+++ b/board/ipe337/ipe337.c
@@ -43,7 +43,7 @@ static int ipe337_devices_init(void) {
 	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);
+	protect_file("/dev/env0", 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 190bae2d3..751828682 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c
+++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
@@ -118,7 +118,7 @@ static int mcfv4e_devices_init(void)
 	 */
 	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);
+	protect_file("/dev/env0", 1);
 
 	//register_device(&sram_dev);
 	//register_device(&nand_dev);
diff --git a/board/netx/netx.c b/board/netx/netx.c
index afbd43e44..6f6aa78e1 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -78,7 +78,7 @@ static int netx_devices_init(void) {
 	/* Do not overwrite primary env for now */
 	devfs_add_partition("nor0", 0xc0000, 0x80000, PARTITION_FIXED, "env0");
 
-	dev_protect(&cfi_dev, 0x40000, 0, 1);
+	protect_file("/dev/env0", 1);
 
 	armlinux_add_dram(&sdram_dev);
 	armlinux_set_bootparams((void *)0x80000100);
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c
index eec41cae1..e265ca4ef 100644
--- a/board/pcm037/pcm037.c
+++ b/board/pcm037/pcm037.c
@@ -252,7 +252,7 @@ static int imx31_devices_init(void)
 	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);
+	protect_file("/dev/env0", 1);
 
 	register_device(&sram_dev);
 	register_device(&nand_dev);
diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c
index f4105ea36..175614632 100644
--- a/board/pcm038/pcm038.c
+++ b/board/pcm038/pcm038.c
@@ -336,7 +336,8 @@ static int pcm038_devices_init(void)
 	default:
 		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);
+		protect_file("/dev/env0", 1);
+
 		envdev = "NOR";
 	}
 
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index 8e0eab4f9..86b32332d 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -103,7 +103,7 @@ static int imx35_devices_init(void)
 	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);
+	protect_file("/dev/env0", 1);
 
 	register_device(&nand_dev);
 
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c
index f4816ce47..f8e96d3af 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.c
+++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c
@@ -101,7 +101,7 @@ static int mcfv4e_devices_init(void)
 	 */
 	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);
+	protect_file("/dev/env0", 1);
 
 	register_device(&network_dev0);
 	//register_device(&network_dev1);
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index c7e53dfb9..af666f2af 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -94,7 +94,7 @@ static int scb9328_devices_init(void) {
 
 	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);
+	protect_file("/dev/env0", 1);
 
 	armlinux_add_dram(&sdram_dev);
 	armlinux_set_bootparams((void *)0x08000100);