138c138
< parser.add_option("--cpu-type", type="choice", default="atomic",
---
> parser.add_option("--cpu-type", type="choice", default="AtomicSimpleCPU",
256c256
< default="atomic", choices=CpuConfig.cpu_names(),
---
> default="AtomicSimpleCPU", choices=CpuConfig.cpu_names(),