MMC stops working - Naoki Mainline Fork

[PhoenixMage]

I am using Naoki's fork for mainline u-boot (https://github.com/RadxaNaoki/u-boot/commits/rock-3) on a Rock 3A.

I am able to get to command line but any attempt to use the eMMC seems to get clobbered.

U-Boot SPL 2023.01 (Jan 19 2023 - 12:45:19 +0000)
Trying to boot from MMC1
Card did not respond to voltage select! : -110
spl: mmc init failed with error: -95
Trying to boot from MMC2
INFO: Preloader serial: 2
NOTICE: BL31: v2.3():v2.3-152-g4e725b15f:cl
NOTICE: BL31: Built : 10:51:13, Jul 15 2021
INFO: GICv3 without legacy support detected.
INFO: ARM GICv3 driver initialized in EL3
INFO: pmu v1 is valid
INFO: dfs DDR fsp_param[0].freq_mhz= 1560MHz
INFO: dfs DDR fsp_param[1].freq_mhz= 324MHz
INFO: dfs DDR fsp_param[2].freq_mhz= 528MHz
INFO: dfs DDR fsp_param[3].freq_mhz= 780MHz
INFO: Using opteed sec cpu_context!
INFO: boot cpu mask: 0
INFO: BL31: Initializing runtime services
WARNING: No OPTEE provided by BL2 boot loader, Booting device without OPTEE initialization. SMC`s destined for OPTEE will return SMC_UNK
ERROR: Error initializing runtime service opteed_fast
INFO: BL31: Preparing for EL3 exit to normal world
INFO: Entry point address = 0xa00000
INFO: SPSR = 0x3c9

U-Boot 2023.01 (Jan 19 2023 - 12:45:19 +0000)

Model: Radxa ROCK3 Model A
DRAM: 8 GiB (effective 7.7 GiB)
Core: 237 devices, 17 uclasses, devicetree: separate
MMC: mmc@fe2b0000: 1, mmc@fe310000: 0
Loading Environment from MMC... *** Warning - bad CRC, using default environment

In: serial@fe660000
Out: serial@fe660000
Err: serial@fe660000
Model: Radxa ROCK3 Model A
Net: No ethernet found.
Hit any key to stop autoboot: 0
=> mmc info
Device: mmc@fe310000
Manufacturer ID: 88
OEM: 3
Name: SLD64G
Bus Speed: 52000000
Mode: MMC High Speed (52MHz)
Rd Block Len: 512
MMC version 5.1
High Capacity: Yes
Capacity: 57.6 GiB
Bus Width: 8-bit
Erase Group Size: 512 KiB
HC WP Group Size: 4 MiB
User Capacity: 57.6 GiB WRREL
Boot Capacity: 4 MiB ENH
RPMB Capacity: 4 MiB ENH
Boot area 0 is not write protected
Boot area 1 is not write protected
=> mmc part

Partition Map for MMC device 0 -- Partition Type: EFI

=> ls mmc 0:1
** No partition table - mmc 0 **
Couldn't find partition mmc 0:1
=> fatls mmc 0:1
=> mmc part

Partition Map for MMC device 0 -- Partition Type: DOS

Part Start Sector Num Sectors UUID Type
** Can't read partition table on 0:0 **
=> mmc rescan
=> mmc part
=> mmc info

I can only assume running these commands has clobbered something in memory so the partition data disappears and I cant find a way to reload it.