Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fastboot: Extend fastboot_set_reboot_flag with reboot reason

Browse source 
Extend fastboot_set_reboot_flag arguments with reboot reason so that
it could handle different reboot cases in future.

Signed-off-by: Roman Kovalivskyi <roman.kovalivskyi@globallogic.com>
This commit is contained in:
Roman Kovalivskyi 2020-07-28 23:35:32 +03:00 committed by Marek Vasut
parent 73f4ebb659
commit 851737ab89
9 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-meson/board-common.c
View file

@ -5,6 +5,7 @@
#include <common.h> #include <common.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <fastboot.h>
#include <init.h> #include <init.h>
#include <net.h> #include <net.h>
#include <asm/arch/boot.h> #include <asm/arch/boot.h>
@ -153,8 +154,11 @@ int board_late_init(void)
#if CONFIG_IS_ENABLED(FASTBOOT) #if CONFIG_IS_ENABLED(FASTBOOT)
static unsigned int reboot_reason = REBOOT_REASON_NORMAL; static unsigned int reboot_reason = REBOOT_REASON_NORMAL;
int fastboot_set_reboot_flag() int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
{ {
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
return -ENOTSUPP;
reboot_reason = REBOOT_REASON_BOOTLOADER; reboot_reason = REBOOT_REASON_BOOTLOADER;
printf("Using reboot reason: 0x%x\n", reboot_reason); printf("Using reboot reason: 0x%x\n", reboot_reason);

6
arch/arm/mach-rockchip/board.c
View file

@ -6,6 +6,7 @@
#include <clk.h> #include <clk.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <dm.h> #include <dm.h>
#include <fastboot.h>
#include <init.h> #include <init.h>
#include <log.h> #include <log.h>
#include <ram.h> #include <ram.h>
@ -152,8 +153,11 @@ int board_usb_init(int index, enum usb_init_type init)
#endif /* CONFIG_USB_GADGET */ #endif /* CONFIG_USB_GADGET */
#if CONFIG_IS_ENABLED(FASTBOOT) #if CONFIG_IS_ENABLED(FASTBOOT)
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"); printf("Setting reboot to fastboot flag ...\n");
/* Set boot mode to fastboot */ /* Set boot mode to fastboot */
writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG); writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG);

6
board/amazon/kc1/kc1.c
View file

@ -8,6 +8,7 @@
#include <config.h> #include <config.h>
#include <common.h> #include <common.h>
#include <env.h> #include <env.h>
#include <fastboot.h>
#include <init.h> #include <init.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/usb/musb.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); 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"); return omap_reboot_mode_store("b");
} }

6
board/lg/sniper/sniper.c
View file

@ -9,6 +9,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <env.h> #include <env.h>
#include <fastboot.h>
#include <init.h> #include <init.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/usb/musb.h> #include <linux/usb/musb.h>
@ -175,8 +176,11 @@ void reset_misc(void)
omap_reboot_mode_store(reboot_mode); 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"); return omap_reboot_mode_store("b");
} }

6
board/ti/am57xx/board.c
View file

@ -9,6 +9,7 @@
#include <common.h> #include <common.h>
#include <env.h> #include <env.h>
#include <fastboot.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <image.h> #include <image.h>
#include <init.h> #include <init.h>
@ -1172,8 +1173,11 @@ int board_fit_config_name_match(const char *name)
#endif #endif
#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) #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"); printf("Setting reboot to fastboot flag ...\n");
env_set("dofastboot", "1"); env_set("dofastboot", "1");
env_save(); env_save();

6
board/ti/dra7xx/evm.c
View file

@ -12,6 +12,7 @@
#include <common.h> #include <common.h>
#include <env.h> #include <env.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <fastboot.h>
#include <image.h> #include <image.h>
#include <init.h> #include <init.h>
#include <spl.h> #include <spl.h>
@ -1050,8 +1051,11 @@ int board_fit_config_name_match(const char *name)
#endif #endif
#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) #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"); printf("Setting reboot to fastboot flag ...\n");
env_set("dofastboot", "1"); env_set("dofastboot", "1");
env_save(); env_save();

2
drivers/fastboot/fb_command.c
View file

@ -307,7 +307,7 @@ static void erase(char *cmd_parameter, char *response)
*/ */
static void reboot_bootloader(char *cmd_parameter, char *response) static void reboot_bootloader(char *cmd_parameter, char *response)
{ {
if (fastboot_set_reboot_flag()) if (fastboot_set_reboot_flag(FASTBOOT_REBOOT_REASON_BOOTLOADER))
fastboot_fail("Cannot set reboot flag", response); fastboot_fail("Cannot set reboot flag", response);
else else
fastboot_okay(NULL, response); fastboot_okay(NULL, response);

2
drivers/fastboot/fb_common.c
View file

@ -88,7 +88,7 @@ void fastboot_okay(const char *reason, char *response)
* which sets whatever flag your board specific Android bootloader flow * which sets whatever flag your board specific Android bootloader flow
* requires in order to re-enter the bootloader. * requires in order to re-enter the bootloader.
*/ */
int __weak fastboot_set_reboot_flag(void) int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
{ {
return -ENOSYS; return -ENOSYS;
} }

10
include/fastboot.h
View file

@ -40,6 +40,14 @@ enum {
FASTBOOT_COMMAND_COUNT FASTBOOT_COMMAND_COUNT
}; };
/**
* Reboot reasons
*/
enum fastboot_reboot_reason {
FASTBOOT_REBOOT_REASON_BOOTLOADER,
FASTBOOT_REBOOT_REASONS_COUNT
};
/** /**
* fastboot_response() - Writes a response of the form "$tag$reason". * fastboot_response() - Writes a response of the form "$tag$reason".
* *
@ -77,7 +85,7 @@ void fastboot_okay(const char *reason, char *response);
* which sets whatever flag your board specific Android bootloader flow * which sets whatever flag your board specific Android bootloader flow
* requires in order to re-enter the bootloader. * requires in order to re-enter the bootloader.
*/ */
int fastboot_set_reboot_flag(void); int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason);
/** /**
* fastboot_set_progress_callback() - set progress callback * fastboot_set_progress_callback() - set progress callback