projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: power: Add a new driver for the TPS65090 PMIC
[oweals/u-boot.git]
/
drivers
/
dfu
/
dfu.c
diff --git
a/drivers/dfu/dfu.c
b/drivers/dfu/dfu.c
index 14cb366b014cb3e7fb9de8f9e316783c1be05f19..675162d927d8863a96952f407c0fced396e9c48c 100644
(file)
--- a/
drivers/dfu/dfu.c
+++ b/
drivers/dfu/dfu.c
@@
-17,7
+17,6
@@
#include <linux/list.h>
#include <linux/compiler.h>
#include <linux/list.h>
#include <linux/compiler.h>
-static bool dfu_detach_request;
static LIST_HEAD(dfu_list);
static int dfu_alt_num;
static int alt_num_cnt;
static LIST_HEAD(dfu_list);
static int dfu_alt_num;
static int alt_num_cnt;
@@
-39,21
+38,6
@@
__weak bool dfu_usb_get_reset(void)
return true;
}
return true;
}
-bool dfu_detach(void)
-{
- return dfu_detach_request;
-}
-
-void dfu_trigger_detach(void)
-{
- dfu_detach_request = true;
-}
-
-void dfu_clear_detach(void)
-{
- dfu_detach_request = false;
-}
-
static int dfu_find_alt_num(const char *s)
{
int i = 0;
static int dfu_find_alt_num(const char *s)
{
int i = 0;
@@
-71,6
+55,9
@@
int dfu_init_env_entities(char *interface, char *devstr)
char *env_bkp;
int ret;
char *env_bkp;
int ret;
+#ifdef CONFIG_SET_DFU_ALT_INFO
+ set_dfu_alt_info(interface, devstr);
+#endif
str_env = getenv("dfu_alt_info");
if (!str_env) {
error("\"dfu_alt_info\" env variable not defined!\n");
str_env = getenv("dfu_alt_info");
if (!str_env) {
error("\"dfu_alt_info\" env variable not defined!\n");
@@
-111,8
+98,12
@@
unsigned char *dfu_get_buf(struct dfu_entity *dfu)
return dfu_buf;
s = getenv("dfu_bufsiz");
return dfu_buf;
s = getenv("dfu_bufsiz");
- dfu_buf_size = s ? (unsigned long)simple_strtol(s, NULL, 16) :
- CONFIG_SYS_DFU_DATA_BUF_SIZE;
+ if (s)
+ dfu_buf_size = (unsigned long)simple_strtol(s, NULL, 0);
+
+ if (!s || !dfu_buf_size)
+ dfu_buf_size = CONFIG_SYS_DFU_DATA_BUF_SIZE;
+
if (dfu->max_buf_size && dfu_buf_size > dfu->max_buf_size)
dfu_buf_size = dfu->max_buf_size;
if (dfu->max_buf_size && dfu_buf_size > dfu->max_buf_size)
dfu_buf_size = dfu->max_buf_size;
@@
-207,9
+198,9
@@
int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)
{
int ret;
{
int ret;
- debug("%s: name: %s buf: 0x%p size: 0x%x p_num: 0x%x offset: 0x%llx bufoffset: 0x%x\n",
+ debug("%s: name: %s buf: 0x%p size: 0x%x p_num: 0x%x offset: 0x%llx bufoffset: 0x%
l
x\n",
__func__, dfu->name, buf, size, blk_seq_num, dfu->offset,
__func__, dfu->name, buf, size, blk_seq_num, dfu->offset,
-
dfu->i_buf - dfu->i_buf_start
);
+
(unsigned long)(dfu->i_buf - dfu->i_buf_start)
);
if (!dfu->inited) {
/* initial state */
if (!dfu->inited) {
/* initial state */