aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-09-03 09:48:28 -0400
committerTom Rini <trini@konsulko.com>2020-09-03 09:48:28 -0400
commit9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426 (patch)
tree50aa5bfd07887062e0d6808158a02434c9a85116 /board
parent7f4d3c044504668fcbc547af52e0c2c4fd715d27 (diff)
parent293a6dfeb96129abebf1ad927fa9aedf03a66d34 (diff)
downloadu-boot-9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426.zip
u-boot-9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426.tar.gz
u-boot-9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Mostly DFU fixes and r8152 fixes
Diffstat (limited to 'board')
-rw-r--r--board/amazon/kc1/kc1.c6
-rw-r--r--board/lg/sniper/sniper.c6
-rw-r--r--board/ti/am57xx/board.c6
-rw-r--r--board/ti/dra7xx/evm.c6
4 files changed, 20 insertions, 4 deletions
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 7d62a1d..973bc5a 100644
--- 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 b08a267..dff1590 100644
--- 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 69dce70..7809875 100644
--- 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 5ae179f..ca1976e 100644
--- 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();