| Message ID | 1ffd8fe7b523ae4631821f4f419ae7557046c412.1571138632.git.michal.simek@xilinx.com |
|---|---|
| State | Deferred |
| Headers | show |
| Series | [U-Boot] ARM: zynq: Remove unused board_early_init_f() | expand |
út 15. 10. 2019 v 13:23 odesílatel Michal Simek <michal.simek@xilinx.com> napsal: > > board_early_init_f added by commit e6cc3b25d721 > ("arm: zynq: Wire watchdog internals") is no longer needed that's why > remove it also with Kconfig enabling. > > Fixes: ccd063e9812a ("watchdog: Move watchdog_dev to data section (BSS may not be cleared)") > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > arch/arm/Kconfig | 1 - > board/xilinx/zynq/board.c | 7 ------- > 2 files changed, 8 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 1df2aba3c2da..b74830e1d239 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1008,7 +1008,6 @@ config ARCH_VF610 > > config ARCH_ZYNQ > bool "Xilinx Zynq based platform" > - select BOARD_EARLY_INIT_F if WDT > select CLK > select CLK_ZYNQ > select CPU_V7A > diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c > index 7cfe69db6935..8a216ed619bf 100644 > --- a/board/xilinx/zynq/board.c > +++ b/board/xilinx/zynq/board.c > @@ -19,13 +19,6 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_BOARD_EARLY_INIT_F) > -int board_early_init_f(void) > -{ > - return 0; > -} > -#endif > - > int board_init(void) > { > return 0; > -- > 2.17.1 > Applied but also remove CONFIG_BOARD_EARLY_INIT_F=y from dlc20 defconfig. M
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1df2aba3c2da..b74830e1d239 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1008,7 +1008,6 @@ config ARCH_VF610 config ARCH_ZYNQ bool "Xilinx Zynq based platform" - select BOARD_EARLY_INIT_F if WDT select CLK select CLK_ZYNQ select CPU_V7A diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 7cfe69db6935..8a216ed619bf 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -19,13 +19,6 @@ DECLARE_GLOBAL_DATA_PTR; -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_BOARD_EARLY_INIT_F) -int board_early_init_f(void) -{ - return 0; -} -#endif - int board_init(void) { return 0;
board_early_init_f added by commit e6cc3b25d721 ("arm: zynq: Wire watchdog internals") is no longer needed that's why remove it also with Kconfig enabling. Fixes: ccd063e9812a ("watchdog: Move watchdog_dev to data section (BSS may not be cleared)") Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/Kconfig | 1 - board/xilinx/zynq/board.c | 7 ------- 2 files changed, 8 deletions(-)