Merge branch '2020-05-15-kconfig-migrations'

- Convert CONFIG_DELAY_ENVIRONMENT to Kconfig and update initr_pci to be
  Kconfig'd.