diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-26 13:50:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-26 13:50:00 -0400 |
| commit | 07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f (patch) | |
| tree | f9b57804a3f3c57efcb5a17c836396b3b04dbf5f /arch/powerpc/cpu/mpc8xx | |
| parent | 1c64692df20c1f491ea79de3a732428611bb0ba0 (diff) | |
| parent | b684d4031b38b6b6a9e22676c7c6e2770e767cc7 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Add DM based generic watchdog start and reset implementation
and remove all ad-hoc implementations (Stefan)
- Move mv_sdhci to DM (Pierre)
- Misc turris_omnia updates (Pierre)
- Change openrd targets to correctly build again (size changes
and fixes to the dts targets) and bring it back into Travis
builds (Stefan)
- Add Kirkwood db-88f6281-bp board (Chris)
Diffstat (limited to 'arch/powerpc/cpu/mpc8xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig index b0e90a0f20..3e8ea38529 100644 --- a/arch/powerpc/cpu/mpc8xx/Kconfig +++ b/arch/powerpc/cpu/mpc8xx/Kconfig @@ -25,9 +25,9 @@ config MPC885 endchoice -config MPC8xx_WATCHDOG - bool "Watchdog" - select HW_WATCHDOG +#config MPC8xx_WATCHDOG +# bool "Watchdog" +# select HW_WATCHDOG config 8xx_GCLK_FREQ int "CPU GCLK Frequency" |