On Wed, Nov 07, 2012 at 12:44:29PM +0000, Scott Ling wrote:

Move the firmware load and record parsing functionality out into a separate function from the boot function.

This still doesn't apply. What are you generating these against? Code for upstream should be generated against the current upstream...