Merge branch '2019-08-02-autoboot-cleanup'

- Merge Simon Glass's series to cleanup the autoboot code