nRF9160 Custom Board NCS 2.0.2 to NCS 2.1.0 Error

I'm updating the NCS we are using from 2.0.2 to 2.1.0 in order to use the modem firmware 1.3.3 that was just released. I verified my build with NCS 2.0.0, 2.0.1 and 2.0.2, it builds with all of those, but when I move to 2.1.0 I get this:

/Users/deps/nrf/lib/nrf_modem_lib/nrf_modem_os.c:17:10: fatal error: pm_config.h: No such file or directory
   17 | #include <pm_config.h>

All of the tickets I've reviewed so far say that it is related to building for "non secure", which is what I'm doing already. Did something else change between 2.0.2 and 2.1.0 that needs to be changed or set for the non-secure partition manager?

Related