[U-Boot] [PATCH v6 12/12] sf: Code cleanups