Merge tag 'rpi-next-2020.01' of https://github.com/mbgg/u-boot

- add RPi4 upstream compatible to pinctrl
- fix boot banner on RPi3/4
- add support for one binary on RPi3/4

diff --combined include/configs/rpi.h
index c03bad811ba914e48d045bb428525c6f3709a6a0,69b09f3f7293b7ab594e82d6de13f9070bf4dae6..83e258a6b958b69ed423f3d8311ef51601ef7449
--- 1/include/configs/rpi.h
--- 2/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@@ -9,6 -9,10 +9,10 @@@
  #include <linux/sizes.h>
  #include <asm/arch/timer.h>
  
+ #ifndef __ASSEMBLY__
+ #include <asm/arch/base.h>
+ #endif
+ 
  #if defined(CONFIG_TARGET_RPI_2) || defined(CONFIG_TARGET_RPI_3_32B)
  #define CONFIG_SKIP_LOWLEVEL_INIT
  #endif
@@@ -74,6 -78,7 +78,6 @@@
  #define CONFIG_SYS_CBSIZE             1024
  
  /* Environment */
 -#define CONFIG_ENV_SIZE                       SZ_16K
  #define CONFIG_SYS_LOAD_ADDR          0x1000000
  
  /* Shell */