Xavier NX Jetpack 5.x boot issue with PCIE devices

Transitioning from Jetpack 4 to 5 has caused my custom carrier board to no long boot. I found that with no NVME drive i can get it to boot with the kernel option “pcie_ports=compat” however, once an NVME drive is installed this work around does not work. On Jetpack 5.0.2 if i select next boot as the SD card the system boots fine, but this only work for that next boot (This same work around did not work on Jetpack 5.1 BIOS). i have tried enabling fast UEFI boot and removing all boot devices with the exception of the SD card but the other devices still auto populate and seem to cause boot issues. It does seem like there is an interaction with the PCIE devices on our carrier, specifically the Diodes/Pericom PI7C9X440SLBFDE however it does seem to be made worse by the new UEFI BIOS and the interaction with the PCIE devices. Is there any way to disable PCIE support in the BIOS or disable NVME booting?