Added support for disabling auto detection and xv6 support