forked from dlink-dir_819/openwrt
The following upstreamed / superseded patches were dropped: 060-01-clk-mediatek-mt7629-fix-parent-clock-of-some-top-clo.patch 060-02-arm-dts-mt7629-fix-sgmii-clock-selection-for-etherne.patch 060-03-net-mediatek-use-correct-register-field-for-SGMII-sp.patch 060-04-net-mediatek-correct-register-name-of-ethsys-syscfg1.patch 060-05-net-mediatek-fix-sgmii-selection-for-mt7622.patch 060-06-net-mediatek-fix-gmac2-usability-for-mt7629.patch 060-07-net-mediatek-add-support-for-10GBASE-R.patch 060-08-net-mediatek-make-sgmii-usxgmii-optional.patch 060-09-net-mediatek-don-t-enable-GDMA-cpu-bridge-unconditio.patch 060-10-net-mediatek-fix-usability-with-wget-command.patch 061-01-net-mediatek-split-ethernet-switch-code-from-mtk_eth.patch 061-02-net-mediatek-add-support-for-MediaTek-MT7987-SoC.patch 061-03-net-mediatek-add-support-for-Airoha-AN8855-ethernet-.patch 070-01-board-mediatek-mt7622-remove-board_late_init.patch 070-02-clk-mediatek-fix-uninitialized-fields-issue-in-INFRA.patch 070-03-configs-mt7629-move-image-load-address-to-0x42000000.patch 070-04-configs-mt7988-move-image-load-address-to-0x44000000.patch 070-05-spi-mtk_spim-add-support-to-use-DT-live-tree.patch 070-06-spi-mtk_spim-check-slave-device-mode-in-spi-mem-s-su.patch 070-07-arm-dts-mediatek-add-quad-mode-capabilities-for-SPI-.patch 070-08-pwm-mediatek-add-pwm3-support-for-mt7981.patch 070-09-pci-mediatek-add-support-for-multiple-ports-in-media.patch 070-10-arm-dts-mediatek-add-pcie-support-for-mt7988.patch 070-11-arm-dts-medaitek-fix-internal-switch-link-speed-of-m.patch 070-12-arm-dts-mediatek-add-support-for-all-three-GMACs-for.patch 070-13-arm-dts-medaitek-add-flash-interface-driving-setting.patch 070-14-arm-dts-mediatek-update-mt7981-mmc-node.patch 070-15-MAINTAINERS-update-file-list-for-MediaTek-ARM-platfo.patch 071-01-pinctrl-mediatek-update-mt7981-pinctrl-driver-based-.patch 100-18-board-mt7629-add-support-for-booting-from-SPI-NAND.patch 290-mt7981-add-USB-nodes.patch Refreshed all the patches needing it. Run-tested: GatoNetworks GDSP, Arcadyan Mozart (ynezz), Zbt WG3526 (dangowrt) Signed-off-by: Enrico Mioso <mrkiko.rs@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> [patch refresh, Mozart testing] Signed-off-by: Daniel Golle <daniel@makrotopia.org> [rebased, tested on MT7621]
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From 9c1ad8a18ac1a20aee7a617964bcae3e90dac700 Mon Sep 17 00:00:00 2001
|
|
From: Enrico Mioso <mrkiko.rs@gmail.com>
|
|
Date: Wed, 23 Oct 2024 17:46:35 +0200
|
|
Subject: [PATCH] uboot-mediatek: initialized the watchdog subsystem later
|
|
|
|
Initialize the watchdog subsystem later during initialization, to allow for
|
|
the gpio-wdt driver to work.
|
|
|
|
Signed-off-by: Enrico Mioso <mrkiko.rs@gmail.com>
|
|
---
|
|
common/board_r.c | 11 ++++-------
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
--- a/common/board_r.c
|
|
+++ b/common/board_r.c
|
|
@@ -681,19 +681,13 @@ static init_fnc_t init_sequence_r[] = {
|
|
serial_initialize,
|
|
initr_announce,
|
|
dm_announce,
|
|
-#if CONFIG_IS_ENABLED(WDT)
|
|
- initr_watchdog,
|
|
-#endif
|
|
- INIT_FUNC_WATCHDOG_RESET
|
|
arch_initr_trap,
|
|
#if defined(CONFIG_BOARD_EARLY_INIT_R)
|
|
board_early_init_r,
|
|
#endif
|
|
- INIT_FUNC_WATCHDOG_RESET
|
|
#ifdef CONFIG_POST
|
|
post_output_backlog,
|
|
#endif
|
|
- INIT_FUNC_WATCHDOG_RESET
|
|
#if defined(CONFIG_PCI_INIT_R) && defined(CONFIG_SYS_EARLY_PCI_INIT)
|
|
/*
|
|
* Do early PCI configuration _before_ the flash gets initialised,
|
|
@@ -708,7 +702,6 @@ static init_fnc_t init_sequence_r[] = {
|
|
#ifdef CONFIG_MTD_NOR_FLASH
|
|
initr_flash,
|
|
#endif
|
|
- INIT_FUNC_WATCHDOG_RESET
|
|
#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86)
|
|
/* initialize higher level parts of CPU like time base and timers */
|
|
cpu_init_r,
|
|
@@ -737,6 +730,10 @@ static init_fnc_t init_sequence_r[] = {
|
|
#ifdef CONFIG_PVBLOCK
|
|
initr_pvblock,
|
|
#endif
|
|
+#if CONFIG_IS_ENABLED(WDT)
|
|
+ initr_watchdog,
|
|
+#endif
|
|
+ INIT_FUNC_WATCHDOG_RESET
|
|
initr_env,
|
|
#ifdef CONFIG_SYS_MALLOC_BOOTPARAMS
|
|
initr_malloc_bootparams,
|