projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thermal: imx_tmu: support i.MX8MP
[oweals/u-boot.git]
/
common
/
update.c
diff --git
a/common/update.c
b/common/update.c
index 33bffaa89eca52014e88fdab626912be8f55bbdf..c8dd346a0956951a0683679bdd37d13c07383e60 100644
(file)
--- a/
common/update.c
+++ b/
common/update.c
@@
-1,13
+1,14
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2008 Semihalf
*
* Written by: Rafal Czubak <rcz@semihalf.com>
* Bartlomiej Sieka <tur@semihalf.com>
/*
* (C) Copyright 2008 Semihalf
*
* Written by: Rafal Czubak <rcz@semihalf.com>
* Bartlomiej Sieka <tur@semihalf.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <cpu_func.h>
+#include <image.h>
#if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
#if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
@@
-18,12
+19,14
@@
#endif
#include <command.h>
#endif
#include <command.h>
+#include <env.h>
#include <flash.h>
#include <net.h>
#include <net/tftp.h>
#include <malloc.h>
#include <dfu.h>
#include <errno.h>
#include <flash.h>
#include <net.h>
#include <net/tftp.h>
#include <malloc.h>
#include <dfu.h>
#include <errno.h>
+#include <mtd/cfi_flash.h>
/* env variable holding the location of the update file */
#define UPDATE_FILE_ENV "updatefile"
/* env variable holding the location of the update file */
#define UPDATE_FILE_ENV "updatefile"
@@
-43,7
+46,6
@@
extern ulong tftp_timeout_ms;
extern int tftp_timeout_count_max;
extern ulong tftp_timeout_ms;
extern int tftp_timeout_count_max;
-extern ulong load_addr;
#ifdef CONFIG_MTD_NOR_FLASH
extern flash_info_t flash_info[];
static uchar *saved_prot_info;
#ifdef CONFIG_MTD_NOR_FLASH
extern flash_info_t flash_info[];
static uchar *saved_prot_info;
@@
-70,7
+72,7
@@
static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)
env_set("netretry", "no");
/* download the update file */
env_set("netretry", "no");
/* download the update file */
- load_addr = addr;
+
image_
load_addr = addr;
copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name));
size = net_loop(TFTPGET);
copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name));
size = net_loop(TFTPGET);