[U-Boot] Minor i.MX6 updates

Peter Robinson
2015-06-24T16:09:43Z

The first two patches are a resend and basic cleanups of duplicate includes

The second two patches consolidate the fuse and thermal options. They're both
options that are standard SoC features so should be there by default for all
devices.