Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 4564d8f3977a6ed448edf9567f4eb6a6b8c127c8)
[Peter: drop Makefile changes]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>