[U-Boot] i.MX6: updates to support boards with multiple CPU options

This set of patches simplifies the code for i.MX6 boards that support multiple processor options as discussed in this RFC: http://lists.denx.de/pipermail/u-boot/2013-January/#145562

Patch 1 is a simple whitespace change so that patch 2 passes checkpatch (ignoring long lines).