diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-03 09:48:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-03 09:48:28 -0400 |
| commit | 9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426 (patch) | |
| tree | 50aa5bfd07887062e0d6808158a02434c9a85116 /arch | |
| parent | 7f4d3c044504668fcbc547af52e0c2c4fd715d27 (diff) | |
| parent | 293a6dfeb96129abebf1ad927fa9aedf03a66d34 (diff) | |
| download | u-boot-9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-usbWIP/03Sep2020
- Mostly DFU fixes and r8152 fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-meson/board-common.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/board.c | 6 |
3 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 76a5f7aca6..aa2686bb92 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -187,6 +187,12 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) return 0; } + +#define SDPV_BCD_DEVICE 0x500 +int g_dnl_get_board_bcd_device_number(int gcnum) +{ + return SDPV_BCD_DEVICE; +} #endif #if defined(CONFIG_SPL_MMC_SUPPORT) diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 0f21ec8e53..7ea0ed4794 100644 --- 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 430c0cbf41..ba4da72b39 100644 --- 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); |