[PATCH 2/4] ARM: clean up the kernel selection to be consistent with the rest of the code