Merge branch '2022-08-04-Kconfig-migrations'

[platform/kernel/u-boot.git] / board / cobra5272 / flash.c

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index ca27b49..5d15ed4 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -1,19 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <console.h>
+#include <cpu_func.h>
+#include <flash.h>
+#include <irq_func.h>
+#include <uuid.h>
+#include <linux/delay.h>
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
-void flash_print_info (flash_info_t * info)
+void flash_print_info(flash_info_t *info)
 {
        int i;
 
@@ -54,7 +58,7 @@ Done:
 }
 
 
-unsigned long flash_init (void)
+unsigned long flash_init(void)
 {
        int i, j;
        ulong size = 0;
@@ -97,9 +101,9 @@ unsigned long flash_init (void)
                size += flash_info[i].size;
        }
 
-       flash_protect (FLAG_PROTECT_SET,
-                      CONFIG_SYS_FLASH_BASE,
-                      CONFIG_SYS_FLASH_BASE + 0x3ffff, &flash_info[0]);
+       flash_protect(FLAG_PROTECT_SET,
+                     CONFIG_SYS_FLASH_BASE,
+                     CONFIG_SYS_FLASH_BASE + 0x3ffff, &flash_info[0]);
 
        return size;
 }
@@ -126,7 +130,7 @@ unsigned long flash_init (void)
 #define TMO   4
 
 
-int flash_erase (flash_info_t * info, int s_first, int s_last)
+int flash_erase(flash_info_t *info, int s_first, int s_last)
 {
        ulong result;
        int iflag, cflag, prot, sect;
@@ -165,9 +169,9 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
         * chip is in programming mode.
         */
 
-       cflag = icache_status ();
-       icache_disable ();
-       iflag = disable_interrupts ();
+       cflag = icache_status();
+       icache_disable();
+       iflag = disable_interrupts();
 
        printf ("\n");
 
@@ -196,8 +200,8 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
                        do {
                                result = *addr;
 
-                               /* check timeout */
-                               if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
+                               /* check timeout, 1000ms */
+                               if (get_timer(start) > 1000) {
                                        MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
                                        chip1 = TMO;
                                        break;
@@ -232,18 +236,18 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
 
       outahere:
        /* allow flash to settle - wait 10 ms */
-       udelay (10000);
+       mdelay(10);
 
        if (iflag)
-               enable_interrupts ();
+               enable_interrupts();
 
        if (cflag)
-               icache_enable ();
+               icache_enable();
 
        return rc;
 }
 
-static int write_word (flash_info_t * info, ulong dest, ulong data)
+static int write_word(flash_info_t *info, ulong dest, ulong data)
 {
        volatile u16 *addr = (volatile u16 *) dest;
        ulong result;
@@ -268,9 +272,9 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
         * chip is in programming mode.
         */
 
-       cflag = icache_status ();
-       icache_disable ();
-       iflag = disable_interrupts ();
+       cflag = icache_status();
+       icache_disable();
+       iflag = disable_interrupts();
 
        MEM_FLASH_ADDR1 = CMD_UNLOCK1;
        MEM_FLASH_ADDR2 = CMD_UNLOCK2;
@@ -285,8 +289,8 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
        do {
                result = *addr;
 
-               /* check timeout */
-               if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
+               /* check timeout, 1000ms */
+               if (get_timer(start) > 1000) {
                        chip1 = ERR | TMO;
                        break;
                }
@@ -301,16 +305,16 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
                rc = ERR_PROG_ERROR;
 
        if (iflag)
-               enable_interrupts ();
+               enable_interrupts();
 
        if (cflag)
-               icache_enable ();
+               icache_enable();
 
        return rc;
 }
 
 
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
+int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 {
        ulong wp, data;
        int rc;