]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...
authorTom Rini <trini@konsulko.com>
Tue, 30 Jun 2020 15:43:18 +0000 (11:43 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 30 Jun 2020 15:43:18 +0000 (11:43 -0400)
- net: pcnet: cleanup and add DM support
- Makefile: add rule to build an endian-swapped U-Boot image
  used by MIPS Malta EL variants
- CI: add Qemu tests for MIPS Malta

1  2 
Makefile
drivers/mmc/mmc.c
drivers/net/pcnet.c
drivers/video/vidconsole-uclass.c

diff --cc Makefile
Simple merge
Simple merge
index d9ab37b336618d37adaa1c20b0764187ad473f33,8e3e3dbbceea027e6f14a352fd413937200d9bad..0928bc398b14187232e1a80b9bcd630c6fdaa6be
@@@ -8,8 -8,8 +8,9 @@@
  
  #include <common.h>
  #include <cpu_func.h>
+ #include <dm.h>
  #include <log.h>
 +#include <dm.h>
  #include <malloc.h>
  #include <memalign.h>
  #include <net.h>
Simple merge