ARM: rmobile: Merge prior-stage firmware DT fragment into U-Boot DT on Gen3

[oweals/u-boot.git] / cmd / sf.c

diff --git a/cmd/sf.c b/cmd/sf.c
index e993b3e5adcda20060057472a15b0085c1f11442..727837d9cd1f7c99d1cb5ed7fbc90d7ca2bdc8fd 100644 (file)
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -6,12 +6,16 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <div64.h>
 #include <dm.h>
+#include <flash.h>
+#include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/cache.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
 
@@ -79,7 +83,7 @@ static ulong bytes_per_second(unsigned int len, ulong start_ms)
                return 1024 * len / max(get_timer(start_ms), 1UL);
 }
 
-static int do_spi_flash_probe(int argc, char * const argv[])
+static int do_spi_flash_probe(int argc, char *const argv[])
 {
        unsigned int bus = CONFIG_SF_DEFAULT_BUS;
        unsigned int cs = CONFIG_SF_DEFAULT_CS;
@@ -259,7 +263,7 @@ static int spi_flash_update(struct spi_flash *flash, u32 offset,
        return 0;
 }
 
-static int do_spi_flash_read_write(int argc, char * const argv[])
+static int do_spi_flash_read_write(int argc, char *const argv[])
 {
        unsigned long addr;
        void *buf;
@@ -317,7 +321,7 @@ static int do_spi_flash_read_write(int argc, char * const argv[])
        return ret == 0 ? 0 : 1;
 }
 
-static int do_spi_flash_erase(int argc, char * const argv[])
+static int do_spi_flash_erase(int argc, char *const argv[])
 {
        int ret;
        int dev = 0;
@@ -349,7 +353,7 @@ static int do_spi_flash_erase(int argc, char * const argv[])
        return ret == 0 ? 0 : 1;
 }
 
-static int do_spi_protect(int argc, char * const argv[])
+static int do_spi_protect(int argc, char *const argv[])
 {
        int ret = 0;
        loff_t start, len;
@@ -498,7 +502,7 @@ static int spi_flash_test(struct spi_flash *flash, uint8_t *buf, ulong len,
        return 0;
 }
 
-static int do_spi_flash_test(int argc, char * const argv[])
+static int do_spi_flash_test(int argc, char *const argv[])
 {
        unsigned long offset;
        unsigned long len;
@@ -542,8 +546,8 @@ static int do_spi_flash_test(int argc, char * const argv[])
 }
 #endif /* CONFIG_CMD_SF_TEST */
 
-static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_spi_flash(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
        const char *cmd;
        int ret;