mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-29 08:01:08 +00:00
9b643e312d
U-Boot widely uses error() as a bit noisier variant of printf(). This macro causes name conflict with the following line in include/linux/compiler-gcc.h: # define __compiletime_error(message) __attribute__((error(message))) This prevents us from using __compiletime_error(), and makes it difficult to fully sync BUILD_BUG macros with Linux. (Notice Linux's BUILD_BUG_ON_MSG is implemented by using compiletime_assert().) Let's convert error() into now treewide-available pr_err(). Done with the help of Coccinelle, excluing tools/ directory. The semantic patch I used is as follows: // <smpl> @@@@ -error +pr_err (...) // </smpl> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: Re-run Coccinelle] Signed-off-by: Tom Rini <trini@konsulko.com>
57 lines
1.1 KiB
C
57 lines
1.1 KiB
C
/*
|
|
* (C) Copyright 2016
|
|
* Texas Instruments, <www.ti.com>
|
|
*
|
|
* Ravi B <ravibabu@ti.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
#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(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);
|
|
}
|