diff options
| author | Jonas Karlman <jonas@kwiboo.se> | 2024-03-12 23:36:22 +0000 |
|---|---|---|
| committer | Kever Yang <kever.yang@rock-chips.com> | 2024-03-14 18:19:28 +0800 |
| commit | ac58c6f3aa6b5ba6b0c2e226f6349b3480dfdc9e (patch) | |
| tree | bfd8d129a4af74363eac47c151b75b92063e47cb | |
| parent | 3330c8880c6c5c7292121d71534af31e36ca3345 (diff) | |
| download | u-boot-ac58c6f3aa6b5ba6b0c2e226f6349b3480dfdc9e.zip u-boot-ac58c6f3aa6b5ba6b0c2e226f6349b3480dfdc9e.tar.gz u-boot-ac58c6f3aa6b5ba6b0c2e226f6349b3480dfdc9e.tar.bz2 | |
rockchip: board: Move gpt_capsule_update_setup() call
Move the call to gpt_capsule_update_setup() from the weak function
rk_board_late_init() into the main board_late_init() function.
Also change to use IS_ENABLED() instead for defined().
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| -rw-r--r-- | arch/arm/mach-rockchip/board.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 31a1111..e9cfba7 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -34,7 +34,7 @@ #include <asm/arch-rockchip/periph.h> #include <power/regulator.h> -#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION) #define DFU_ALT_BUF_LEN SZ_1K @@ -185,10 +185,6 @@ static void gpt_capsule_update_setup(void) __weak int rk_board_late_init(void) { -#if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION) - gpt_capsule_update_setup(); -#endif - return 0; } @@ -196,6 +192,10 @@ int board_late_init(void) { setup_boot_mode(); +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION) + gpt_capsule_update_setup(); +#endif + return rk_board_late_init(); } |