mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Mostly DFU fixes and r8152 fixes
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
#include <config.h>
|
||||
#include <common.h>
|
||||
#include <env.h>
|
||||
#include <fastboot.h>
|
||||
#include <init.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/usb/musb.h>
|
||||
@@ -163,8 +164,11 @@ void get_board_serial(struct tag_serialnr *serialnr)
|
||||
omap_die_id_get_board_serial(serialnr);
|
||||
}
|
||||
|
||||
int fastboot_set_reboot_flag(void)
|
||||
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
|
||||
{
|
||||
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
|
||||
return -ENOTSUPP;
|
||||
|
||||
return omap_reboot_mode_store("b");
|
||||
}
|
||||
|
||||
|
@@ -9,6 +9,7 @@
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <fastboot.h>
|
||||
#include <init.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/usb/musb.h>
|
||||
@@ -175,8 +176,11 @@ void reset_misc(void)
|
||||
omap_reboot_mode_store(reboot_mode);
|
||||
}
|
||||
|
||||
int fastboot_set_reboot_flag(void)
|
||||
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
|
||||
{
|
||||
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
|
||||
return -ENOTSUPP;
|
||||
|
||||
return omap_reboot_mode_store("b");
|
||||
}
|
||||
|
||||
|
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <env.h>
|
||||
#include <fastboot.h>
|
||||
#include <fdt_support.h>
|
||||
#include <image.h>
|
||||
#include <init.h>
|
||||
@@ -1172,8 +1173,11 @@ int board_fit_config_name_match(const char *name)
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
|
||||
int fastboot_set_reboot_flag(void)
|
||||
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
|
||||
{
|
||||
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
|
||||
return -ENOTSUPP;
|
||||
|
||||
printf("Setting reboot to fastboot flag ...\n");
|
||||
env_set("dofastboot", "1");
|
||||
env_save();
|
||||
|
@@ -12,6 +12,7 @@
|
||||
#include <common.h>
|
||||
#include <env.h>
|
||||
#include <fdt_support.h>
|
||||
#include <fastboot.h>
|
||||
#include <image.h>
|
||||
#include <init.h>
|
||||
#include <spl.h>
|
||||
@@ -1050,8 +1051,11 @@ int board_fit_config_name_match(const char *name)
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
|
||||
int fastboot_set_reboot_flag(void)
|
||||
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
|
||||
{
|
||||
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
|
||||
return -ENOTSUPP;
|
||||
|
||||
printf("Setting reboot to fastboot flag ...\n");
|
||||
env_set("dofastboot", "1");
|
||||
env_save();
|
||||
|
Reference in New Issue
Block a user