diff options
author | Michal Simek <michal.simek@xilinx.com> | 2019-10-15 13:06:32 +0200 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2019-10-24 13:37:03 +0200 |
commit | 3e5476c6cde940536360946ea5672d9b6f048add (patch) | |
tree | aa8c0d2bd95f05a1dd961aecdbe0c8920fdc56c0 | |
parent | 2ce5641df0cd44c20c9049b9eb57908c8c811781 (diff) |
ARM: zynq: Remove unused board_early_init_f()
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>
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | board/xilinx/zynq/board.c | 7 | ||||
-rw-r--r-- | configs/zynq_dlc20_rev1_0_defconfig | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 75041ce30d0..629c5e8c2d3 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 7cfe69db693..8a216ed619b 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; diff --git a/configs/zynq_dlc20_rev1_0_defconfig b/configs/zynq_dlc20_rev1_0_defconfig index e6a67310f1b..9272a3f660e 100644 --- a/configs/zynq_dlc20_rev1_0_defconfig +++ b/configs/zynq_dlc20_rev1_0_defconfig @@ -16,7 +16,6 @@ CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_USE_PREBOOT=y -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y |