add HAVE_DISK_STORAGE, and use that instead of HAVE_FLASH_STORAGE when checking for...