Merge tag 'u-boot-rockchip-20191231' of https://gitlab.denx.de/u-boot/custodians...

- Fix latest mainline kernel for rk3308
- Update rk3288-evb config to suport OP-TEE
- Fix for firefly-px30 DEBUG_UART channel and make it standalone
- Script make_fit_atf add python3 support
- Fix rk3328 timer with correct COUNTER_FREQUENCY
- Fix rk3328 ATF support with enable spl-fifo-mode

diff --combined arch/arm/dts/Makefile
index 88c750a646be5108acbf3854e00206c5bb6a5407,68cad331d8377f58a75f01b2c7c7810833d80283..0127a91a820387a1bb0d7d4ab9f6b5d3f0257980
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -68,7 -68,8 +68,8 @@@ dtb-$(CONFIG_ARCH_OWL) += 
        bubblegum_96.dtb
  
  dtb-$(CONFIG_ROCKCHIP_PX30) += \
-       px30-evb.dtb
+       px30-evb.dtb \
+       px30-firefly.dtb
  
  dtb-$(CONFIG_ROCKCHIP_RK3036) += \
        rk3036-sdk.dtb
@@@ -522,8 -523,7 +523,8 @@@ dtb-$(CONFIG_MACH_SUN8I_H3) += 
        sun8i-h3-orangepi-pc.dtb \
        sun8i-h3-orangepi-pc-plus.dtb \
        sun8i-h3-orangepi-plus.dtb \
 -      sun8i-h3-orangepi-plus2e.dtb
 +      sun8i-h3-orangepi-plus2e.dtb \
 +      sun8i-h3-orangepi-zero-plus2.dtb
  dtb-$(CONFIG_MACH_SUN8I_R40) += \
        sun8i-r40-bananapi-m2-ultra.dtb \
        sun8i-v40-bananapi-m2-berry.dtb