This seems like a better name. This is a patch-up to the earlier commit
63b4b5ba, and also removes a redundant Makefile change.

Signed-off-by: Simon Glass <sjg@chromium.org>