| Message ID | 20180817105902.10692-4-marek.behun@nic.cz |
|---|---|
| State | Accepted |
| Commit | 17445e96882ba8175b599e6790a240359c55d508 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | Updates for Turris Mox | expand |
On 17.08.2018 12:58, Marek Behún wrote: > The macro name CONFIG_WDT_ARMADA_3720 is called CONFIG_WDT_ARMADA_37XX > instead. Fix this so that watchdog really is enabled in board_init. > > Signed-off-by: Marek Behun <marek.behun@nic.cz> > --- > board/CZ.NIC/turris_mox/turris_mox.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c > index 130d4c606d..b6a0ca4626 100644 > --- a/board/CZ.NIC/turris_mox/turris_mox.c > +++ b/board/CZ.NIC/turris_mox/turris_mox.c > @@ -9,13 +9,13 @@ > #include <spi.h> > #include <linux/string.h> > > -#ifdef CONFIG_WDT_ARMADA_3720 > +#ifdef CONFIG_WDT_ARMADA_37XX > #include <wdt.h> > #endif > > DECLARE_GLOBAL_DATA_PTR; > > -#ifdef CONFIG_WDT_ARMADA_3720 > +#ifdef CONFIG_WDT_ARMADA_37XX > static struct udevice *watchdog_dev; > > void watchdog_reset(void) > @@ -41,7 +41,7 @@ int board_init(void) > /* address of boot parameters */ > gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; > > -#ifdef CONFIG_WDT_ARMADA_3720 > +#ifdef CONFIG_WDT_ARMADA_37XX > if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) { > printf("Cannot find Armada 3720 watchdog!\n"); > } else { > Applied to u-boot-marvell/master Thanks, Stefan
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 130d4c606d..b6a0ca4626 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -9,13 +9,13 @@ #include <spi.h> #include <linux/string.h> -#ifdef CONFIG_WDT_ARMADA_3720 +#ifdef CONFIG_WDT_ARMADA_37XX #include <wdt.h> #endif DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_WDT_ARMADA_3720 +#ifdef CONFIG_WDT_ARMADA_37XX static struct udevice *watchdog_dev; void watchdog_reset(void) @@ -41,7 +41,7 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; -#ifdef CONFIG_WDT_ARMADA_3720 +#ifdef CONFIG_WDT_ARMADA_37XX if (uclass_get_device(UCLASS_WDT, 0, &watchdog_dev)) { printf("Cannot find Armada 3720 watchdog!\n"); } else {
The macro name CONFIG_WDT_ARMADA_3720 is called CONFIG_WDT_ARMADA_37XX instead. Fix this so that watchdog really is enabled in board_init. Signed-off-by: Marek Behun <marek.behun@nic.cz> --- board/CZ.NIC/turris_mox/turris_mox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)