[AML] Be rid of damned cpu type magic numbers

As per title.
@stane1983  Ok to bump this for m8 as well?