u-boot (forks) status

[mcerveny]

Hello.

I need to enable some addons in u-boot. Yesterday I resolved many problems/bugs/workarounds in simple enabling "usbkbd" in u-boot (with ayufan-rock64/linux-u-boot (rockchip-master)).

Actual (few) versions u-boot:
upstream
   - with independent rockchip development ?
   - missing support for Rock64
  -> fork rockchip-linux/u-boot
         - "release" branch - pulling randomly from upstream (actively developed) ?
         - missing support for Rock64
    -> fork ayufan-rock64/linux-u-boot
         - "rockchip-master" branch - last rebased/merged 12/2017 (actively developed)
         - "rebased-all-changes-on-release" branch - last rebased 04/2018 + summary commit 06/2018  
         - "mainline-master" branch - last rebased 06/2018 from upstream (not from rockchip-linux)

What is the best u-boot fork/branch for Rock64 ?
How many features/bugfixes are missing from u-boot upstream in rockchip-linux/u-boot fork and vice-versa ?
Is there any chance to that Rockchip joins u-boot upstream ?

For example differences in ehci-generic.c (used in Rock64):
upstream (+2/-1 patches) X rockchip-linux/u-boot (release) (+1/-2 patches)  X ayufan-rock64/linux-u-boot (rockchip-master) (-3 patches)