On Fri, 9 Feb 2024 at 09:50, Quentin Schulz <foss+ub...@0leil.net> wrote: > > From: Quentin Schulz <quentin.sch...@theobroma-systems.com> > > There's only one user of rockchip_capsule_update_board_setup, which is > in board.c, and only one board defines it, so instead of having a header > only for one function symbol, let's just use a weak symbol instead.
Reviewed-by: Peter Robinson <pbrobin...@gmail.com> > Cc: Quentin Schulz <foss+ub...@0leil.net> > Reviewed-by: Kever Yang <kever.y...@rock-chips.com> > Signed-off-by: Quentin Schulz <quentin.sch...@theobroma-systems.com> > --- > arch/arm/include/asm/arch-rockchip/misc.h | 9 --------- > arch/arm/mach-rockchip/board.c | 5 ++++- > 2 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/include/asm/arch-rockchip/misc.h > b/arch/arm/include/asm/arch-rockchip/misc.h > deleted file mode 100644 > index ef37ff1661a..00000000000 > --- a/arch/arm/include/asm/arch-rockchip/misc.h > +++ /dev/null > @@ -1,9 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * RK3399: Architecture common definitions > - * > - * Copyright (C) 2019 Collabora Inc - https://www.collabora.com/ > - * Rohan Garg <rohan.g...@collabora.com> > - */ > - > -void rockchip_capsule_update_board_setup(void); > diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c > index 80b4514852f..4f666aee706 100644 > --- a/arch/arm/mach-rockchip/board.c > +++ b/arch/arm/mach-rockchip/board.c > @@ -32,7 +32,6 @@ > #include <asm/arch-rockchip/boot_mode.h> > #include <asm/arch-rockchip/clock.h> > #include <asm/arch-rockchip/periph.h> > -#include <asm/arch-rockchip/misc.h> > #include <power/regulator.h> > > #if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION) > @@ -148,6 +147,10 @@ void set_dfu_alt_info(char *interface, char *devstr) > env_set("dfu_alt_info", buf); > } > > +__weak void rockchip_capsule_update_board_setup(void) > +{ > +} > + > static void gpt_capsule_update_setup(void) > { > int p, i, ret; > > -- > 2.43.0 >
