Revert "Remove 2 stage ondemand from m7-board"

This reverts commit da1664473c6247cf4dd4a7d7f97ce3dd324e7414.