[U-Boot] Conflicting commits for seaboard USB keyboard handling