From: Tom Rini <trini@konsulko.com>
Date: Sat, 16 May 2020 01:44:46 +0000 (-0400)
Subject: Merge branch '2020-05-15-kconfig-migrations'
X-Git-Tag: v2025.01-rc5-pxa1908~2405
X-Git-Url: http://git.dujemihanovic.xyz/%22/icons/right.gif/static/%7B%7B%20%24image.RelPermalink%20%7D%7D?a=commitdiff_plain;h=515f613253cf0a892c3a321770ab927fa3d925cf;p=u-boot.git

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

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

515f613253cf0a892c3a321770ab927fa3d925cf