Revert "Usual stomping through the Makefiles"

This reverts commit f7daa0b6242b10b04cb1ea4624930445e12ce0ff.

Conflicts:
	Makefile
	arch/arm/Makefile