fastboot: Extend fastboot_set_reboot_flag with reboot reason

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>

diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 0f21ec8e5375c8ece10776fd903ce79a4efcfaf9..7ea0ed479474f85907292000e098b2873843d200 100644 (file)
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <fastboot.h>
 #include <init.h>
 #include <net.h>
 #include <asm/arch/boot.h>
@@ -153,8 +154,11 @@ int board_late_init(void)
 #if CONFIG_IS_ENABLED(FASTBOOT)
 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;
 
        printf("Using reboot reason: 0x%x\n", reboot_reason);

diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 430c0cbf41e49a695e2a21a2094f9f7319ed1642..ba4da72b3910df570647b5d224148c1d2c66601d 100644 (file)
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -6,6 +6,7 @@
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <fastboot.h>
 #include <init.h>
 #include <log.h>
 #include <ram.h>
@@ -152,8 +153,11 @@ int board_usb_init(int index, enum usb_init_type init)
 #endif /* CONFIG_USB_GADGET */
 
 #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");
        /* Set boot mode to fastboot */
        writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG);

diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 7d62a1d5a863f14b6e79d16abc9744cfb511bd06..973bc5a927295ee7c89cf46af3335fe4bbdcd0ce 100644 (file)
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -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");
 }
 

diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index b08a267c52c14e4cba2d622efc1d2948fa3fc4ae..dff159025b1226b283dd74072b6c641c6840d1ee 100644 (file)
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -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");
 }
 

diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 69dce70a60112f4143335006a33388556ebcec21..78098755106bc58e0e15c97c9e1323dacb99586c 100644 (file)
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -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();

diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 5ae179f69b98ea2be6a0fdb818039722f0b3d2d3..ca1976e16a5f088315af98c9b8ebe3149023c2a4 100644 (file)
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -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();

diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 49f6a61c3745a880834f6db611318fae363e1898..8ce5d32fb2ba4e733a5e9cb8e0231dc23ac223ce 100644 (file)
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -307,7 +307,7 @@ static void erase(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);
        else
                fastboot_okay(NULL, response);

diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index c3735a44af74def34404bb0037222a2e8375d346..736ce1cd024f6c5c61bf5620f5872012467df35f 100644 (file)
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -88,7 +88,7 @@ void fastboot_okay(const char *reason, char *response)
  * which sets whatever flag your board specific Android bootloader flow
  * 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;
 }

diff --git a/include/fastboot.h b/include/fastboot.h
index 1933b1d98e3bb9a03832f37b5efb616cb6ec952b..14f4c68868d8b03631248a5117b12f3b7de5afca 100644 (file)
--- a/include/fastboot.h
+++ b/include/fastboot.h
@@ -40,6 +40,14 @@ enum {
        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".
  *
@@ -77,7 +85,7 @@ void fastboot_okay(const char *reason, char *response);
  * which sets whatever flag your board specific Android bootloader flow
  * 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