Add back function that was dropped when reworking the SCM code.
Signed-off-by: NAndy Gross <andy.gross@linaro.org>