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

[Albert ARIBAUD]

Hello,

It seems like two commits 5ddcc38b (in u-boot, committed by Marek)
29f3e3f2 (in u-boot-arm, committed by Tom from u-boot-tegra) are
conflicting on the seaboard configuration header file for USB (and
possibly other areas).

Tom, can you look into it (and involve whoever is needed) and provide a
pull request with a fix, the same way I asked Stefano and Minkyu for
the same?

Thanks in advance!

Amicalement,
-- 
Albert.