Is there U-boot 2020 support for RockPi4B?

I am trying to bring my Rock pi 4 into the current versions of u-boot (2020.01) and using the Dunfell version of Yocto. Although I can get it to boot on the SD card, it does not do so from the eMMC card. I can load a pre-built image on the eMMC and it boots just fine, but that image is using u-boot 2017.09

The errors I see are:

U-Boot SPL 2020.01 (Sep 09 2021 - 20:06:05 +0000)
Trying to boot from MMC2
filename: part:0, sect:16384
switch boot_mode:1
spl: mmc boot mode: raw
Found FIT
mmc fail to send stop cmd
fit read sector 4000, sectors=2, dst=1ffb00, count=0, size=0x2fc
fit read sector 4000, sectors=2, dst=1ffb00, count=0, size=0x2fc
mmc_load_image_raw_sector: mmc block read error
raw mode use sector mmc:4179168, sect:16384
spl: mmc boot mode: fs
Trying to boot from MMC2
filename: part:0, sect:16384
switch boot_mode:1
spl: mmc boot mode: raw
mmc_load_image_raw_sector: mmc block read error
raw mode use sector mmc:4179168, sect:16384

Thanks,

-Steve Boy