On 11/19/2015 08:26 PM, Simon Glass wrote: > Move this option to Kconfig and fix up all users. The version of this that got committed (as fde7e18938d8) contains merge markers in a four files.