[U-Boot] [RFC PATCH v2 13/15] main: Correct header order