leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: Move flash_perror() to flash.h

Browse Source 
This function belongs more in flash.h than common.h so move it.

Also remove the space before the bracket in some calls.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-12-28 10:44:40 -07:00 committed by Tom Rini
parent 6b8d3ceaf5
commit 0ee48252b4
7 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/load.c
View File

@ -12,6 +12,7 @@
#include <console.h>
#include <cpu_func.h>
#include <env.h>
#include <flash.h>
#include <s_record.h>
#include <net.h>
#include <exports.h>
@ -980,7 +981,7 @@ static ulong load_serial_ymodem(ulong offset, int mode)
rc = flash_write((char *) ymodemBuf,
store_addr, res);
if (rc != 0) {
flash_perror (rc);
flash_perror(rc);
return (~0);
}
} else

3
cmd/mem.c
View File

@ -16,6 +16,7 @@
#include <cli.h>
#include <command.h>
#include <console.h>
#include <flash.h>
#include <hash.h>
#include <mapmem.h>
#include <watchdog.h>
@ -339,7 +340,7 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
rc = flash_write((char *)src, (ulong)dst, count * size);
if (rc != 0) {
flash_perror (rc);
flash_perror(rc);
unmap_sysmem(src);
unmap_sysmem(dst);
return (1);

2
common/flash.c
View File

@ -179,7 +179,7 @@ flash_write (char *src, ulong addr, ulong cnt)
/*-----------------------------------------------------------------------
*/
void flash_perror (int err)
void flash_perror(int err)
{
switch (err) {
case ERR_OK:

1
env/flash.c vendored
View File

@ -13,6 +13,7 @@
#include <command.h>
#include <env.h>
#include <env_internal.h>
#include <flash.h>
#include <linux/stddef.h>
#include <malloc.h>
#include <search.h>

3
include/common.h
View File

@ -78,9 +78,6 @@ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */
*/
int arch_fixup_fdt(void *blob);
/* common/flash.c */
void flash_perror (int);
/* common/cmd_source.c */
int source (ulong addr, const char *fit_uname);

7
include/flash.h
View File

@ -117,6 +117,13 @@ extern int jedec_flash_match(flash_info_t *info, ulong base);
#define CFI_CMDSET_AMD_LEGACY 0xFFF0
#endif
/**
* flash_perror() - Print a flash error
*
* @err: Error number of message to print (ERR_... as below)
*/
void flash_perror(int err);
/*-----------------------------------------------------------------------
* return codes from flash_write():
*/

1
net/nfs.c
View File

@ -28,6 +28,7 @@
#include <common.h>
#include <command.h>
#include <flash.h>
#include <net.h>
#include <malloc.h>
#include <mapmem.h>