ARM: fix badly placed mach/plat entries in Kconfig & Makefile