Custom boards broken in NCS SDK v3.1.0?

I have BOARD_ROOT set in both zephyr/module.yml and in CMakeLists, and in my boards folder I have a custom board "boards/nordic/myboard". I have all the necessary files for the board.

When I build, I get "No board named 'myboard' found." If I rename "nordic" folder to "arm", it finds it. However, I then get the error in my .dts "nordic/nrf52840_qiaa.dtsi" not found. If I change this include from `<nordic/nrf52840_qiaa.dtsi>` to `<arm/nordic/nrf52840_qiaa.dtsi>`, it is found, but then that file that is included has errors when parsed due to including more files with `<nordic/` instead of `<arm/nordic/`. This is why I renamed the folder from arm to nordic in the first place.

Related