Merge tag 'mips-pull-2019-11-16' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Fri, 18 Jan 2019 00:12:55 +0000 (19:12 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 18 Jan 2019 00:12:55 +0000 (19:12 -0500)
- MIPS: mscc: various enhancements for Luton and Ocelot platforms
- MIPS: mscc: added support for Jaguar2 platform
- MIPS: optimised SPL linker script
- MIPS: bcm6368: fix restart flow issues
- MIPS: fixed CONFIG_OF_EMBED warnings for all MIPS boards
- MIPS: mt7688: small fixes and enhancements
- mmc: compile-out write support if disabled

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index e192db07548999ad31664d03e4491790a3dec786,3fa5d3e96f5cac7c367890054c644efe888c414b..399a839e071306fc357d6b786e7c2eca498e801a
@@@ -176,8 -176,6 +176,8 @@@ F: drivers/ram/mediatek
  F:    drivers/spi/mtk_qspi.c
  F:    drivers/timer/mtk_timer.c
  F:    drivers/watchdog/mtk_wdt.c
 +F:    drivers/net/mtk_eth.c
 +F:    drivers/reset/reset-mediatek.c
  F:    tools/mtk_image.c
  F:    tools/mtk_image.h
  N:    mediatek
@@@ -523,9 -521,14 +523,14 @@@ F:       arch/mips/mach-mscc
  F:    arch/mips/dts/luton*
  F:    arch/mips/dts/mscc*
  F:    arch/mips/dts/ocelot*
+ F:    arch/mips/dts/jr2*
+ F:    arch/mips/dts/serval*
  F:    board/mscc/
  F:    configs/mscc*
+ F:    drivers/gpio/mscc_sgpio.c
+ F:    drivers/spi/mscc_bb_spi.c
  F:    include/configs/vcoreiii.h
+ F:    drivers/pinctrl/mscc/
  
  MIPS JZ4780
  M:    Ezequiel Garcia <ezequiel@collabora.com>