PSRAM/SD card/PICO D4

[thethinker]

I have been successfully using my PICO-D4 with PSRAM for 2 years on hundreds of boards now, however once I updated IDF to master branch (v4.1-dev-1891-g3634192de-dirty) which is supposed to have PSRAM support for PICO-D4, my code broke and is crashing with this error on boot:
E (1220) memory_layout: SOC_RESERVE_MEMORY_REGION region range 0x3f800000 - 0x40000000 overlaps with 0x3ffae000 - 0x3ffae6e0
The only way I can fix the error is to disable PSRAM.
To give you a bit more info I have attached a picture of my schematic that shows how the psram is connected to pico-d4 (and I can't change it since the board is custom and is installed at remote customer locations all over the world. I have also included my modified spiram_psram.c for old and new IDF.
Can one of the ESP experts comment on this please?

[WiFive]

Try setting your CONFIG_SPIRAM_SIZE back to -1