m8: unify all variants

Conflicts:

	arch/arm/mach-msm/Makefile.boot