X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fmp2usb%2Fflash.c;h=89ced163bb7aaf056f6aba012f2532576664329d;hb=5a164c8ca909f170354ea66835b8145c930b2807;hp=070dbf62c49f7ac503afc35f0feafe858fefe8bb;hpb=0e4018d244f00d7aff055e8f6d52dbc93a40da14;p=u-boot

diff --git a/board/mp2usb/flash.c b/board/mp2usb/flash.c
index 070dbf62c4..89ced163bb 100644
--- a/board/mp2usb/flash.c
+++ b/board/mp2usb/flash.c
@@ -237,7 +237,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 
 int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
-	int flag, prot, sect;
+	int prot, sect;
 	ulong type, start, last;
 	int rcode = 0;
 	int cflag, iflag;
@@ -284,10 +284,8 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 	 */
 	cflag = icache_status ();
 	icache_disable ();
-	iflag = disable_interrupts ();
-
 	/* Disable interrupts which might cause a timeout here */
-/*	flag = disable_interrupts (); */
+	iflag = disable_interrupts ();
 
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect <= s_last; sect++) {
@@ -314,8 +312,8 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 				}
 			}
 
-			*addr = INTEL_CLEAR;	/* clear status register cmd.   */
-			*addr = INTEL_RESET;	/* resest to read mode          */
+			*addr = (FPWV)INTEL_CLEAR;	/* clear status register cmd.   */
+			*addr = (FPWV)INTEL_RESET;	/* resest to read mode          */
 
 			printf (" done\n");
 		}
@@ -425,7 +423,6 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 	FPWV *addr = (FPWV *) dest;
 	ulong status;
 	int cflag, iflag;
-	int flag;
 
 	/* Check if Flash is (sufficiently) erased */
 	if ((*addr & data) != data) {
@@ -441,10 +438,8 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 	 */
 	cflag = icache_status ();
 	icache_disable ();
-	iflag = disable_interrupts ();
-
 	/* Disable interrupts which might cause a timeout here */
-	/*flag = disable_interrupts (); */
+	iflag = disable_interrupts ();
 
 	*addr = (FPW) INTEL_PROG;	/* write setup */
 	*addr = data;