There are a lot of Makefile.* in the top level directory of the tree. Would it make sense to create a new directory for all kinds of additional makefile includes like Makefile.buildtest, Makefile.openocd etc?
Perhaps even renaming them to something shorter like buildtest.mk, cortexm_common.mk etc?