play with make file

Conflicts:

	Makefile
	arch/arm/vfp/Makefile