More CPU options

Change-Id: Ia6b56620e5e9cf784c2c2ceacacf8e9bc4771e73