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