diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-05-29 15:30:46 +0000 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-05-30 11:59:21 +0200 |
| commit | 8a65bd63720b813d8082a2c14bdde5ade4673d87 (patch) | |
| tree | 9335ff5e55bbfdd033db7f086d8ced1a8b874b23 /arch | |
| parent | 52fdf10708ef8022117c803609e85f295ad753c6 (diff) | |
| download | u-boot-8a65bd63720b813d8082a2c14bdde5ade4673d87.zip u-boot-8a65bd63720b813d8082a2c14bdde5ade4673d87.tar.gz u-boot-8a65bd63720b813d8082a2c14bdde5ade4673d87.tar.bz2 | |
fastboot: Rename fb_set_reboot_flag to fastboot_set_reboot_flag
Rename fb_set_reboot_flag to fastboot_set_reboot_flag so it matches
all other fastboot code in the global name space. Fix the guards around
them so that they're dependent on FASTBOOT, not just USB_FUNCTION_FASTBOOT.
Move the weak implementation of fastboot_set_reboot_flag to fb_common.c
so we can call it from non-USB fastboot code.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3128-board.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk322x-board.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 0e9fd03..b22b671 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -237,8 +237,8 @@ void arch_preboot_os(void) } #endif -#if defined(CONFIG_USB_FUNCTION_FASTBOOT) && !defined(CONFIG_ENV_IS_NOWHERE) -int fb_set_reboot_flag(void) +#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +int fastboot_set_reboot_flag(void) { printf("Setting reboot to fastboot flag ...\n"); env_set("dofastboot", "1"); diff --git a/arch/arm/mach-rockchip/rk3128-board.c b/arch/arm/mach-rockchip/rk3128-board.c index 48cd8ba..7fd667a 100644 --- a/arch/arm/mach-rockchip/rk3128-board.c +++ b/arch/arm/mach-rockchip/rk3128-board.c @@ -111,8 +111,8 @@ int board_usb_cleanup(int index, enum usb_init_type init) } #endif -#if defined(CONFIG_USB_FUNCTION_FASTBOOT) -int fb_set_reboot_flag(void) +#if CONFIG_IS_ENABLED(FASTBOOT) +int fastboot_set_reboot_flag(void) { struct rk3128_grf *grf; diff --git a/arch/arm/mach-rockchip/rk322x-board.c b/arch/arm/mach-rockchip/rk322x-board.c index 99a60c4..7366d45 100644 --- a/arch/arm/mach-rockchip/rk322x-board.c +++ b/arch/arm/mach-rockchip/rk322x-board.c @@ -139,8 +139,8 @@ int board_usb_cleanup(int index, enum usb_init_type init) } #endif -#if defined(CONFIG_USB_FUNCTION_FASTBOOT) -int fb_set_reboot_flag(void) +#if CONFIG_IS_ENABLED(FASTBOOT) +int fastboot_set_reboot_flag(void) { struct rk322x_grf *grf; |