mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-31 03:58:17 +00:00
c5d548a9f8
The function set_default_env() sets the hashtable flags for import_r(). Formally set_default_env() doesn't accept flags from its callers. In practice the caller can (un)set the H_INTERACTIVE flag, but it has to be done using the first character of the function's string argument. Other flags like H_FORCE can't be set by the caller. Change the function to accept flags argument. The benefits are: 1. The caller will have to explicitly set the H_INTERACTIVE flag, instead of un-setting it using a special char in a string. 2. Add the ability to propagate flags from the caller to himport(), especially the H_FORCE flag from do_env_default() in nvedit.c that currently gets ignored for "env default -a -f" commands. 3. Flags and messages will not be coupled together. A caller will be able to set flags without passing a string and vice versa. Please note: The propagation of H_FORCE from do_env_default() does not introduce any functional changes, because currently himport_r() is set to destroy the old environment regardless if H_FORCE flag is set or not. More changes are needed to utilize the propagation of H_FORCE. Signed-off-by: Yaniv Levinsky <yaniv.levinsky@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
57 lines
1.1 KiB
C
57 lines
1.1 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2016
|
|
* Texas Instruments, <www.ti.com>
|
|
*
|
|
* Ravi B <ravibabu@ti.com>
|
|
*/
|
|
#include <common.h>
|
|
#include <spl.h>
|
|
#include <linux/compiler.h>
|
|
#include <errno.h>
|
|
#include <watchdog.h>
|
|
#include <console.h>
|
|
#include <g_dnl.h>
|
|
#include <usb.h>
|
|
#include <dfu.h>
|
|
#include <environment.h>
|
|
|
|
static int run_dfu(int usb_index, char *interface, char *devstring)
|
|
{
|
|
int ret;
|
|
|
|
ret = dfu_init_env_entities(interface, devstring);
|
|
if (ret) {
|
|
dfu_free_entities();
|
|
goto exit;
|
|
}
|
|
|
|
run_usb_dnl_gadget(usb_index, "usb_dnl_dfu");
|
|
exit:
|
|
dfu_free_entities();
|
|
return ret;
|
|
}
|
|
|
|
int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr)
|
|
{
|
|
char *str_env;
|
|
int ret;
|
|
|
|
/* set default environment */
|
|
set_default_env(NULL, 0);
|
|
str_env = env_get(dfu_alt_info);
|
|
if (!str_env) {
|
|
pr_err("\"dfu_alt_info\" env variable not defined!\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
ret = env_set("dfu_alt_info", str_env);
|
|
if (ret) {
|
|
pr_err("unable to set env variable \"dfu_alt_info\"!\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* invoke dfu command */
|
|
return run_dfu(usbctrl, interface, devstr);
|
|
}
|