Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e

payloads/libpayload/include/fmap.h

@@ -0,0 +1,12 @@
+/* SPDX_License-Identifier: BSD-3-Clause */
+
+#ifndef _FMAP_H
+#define _FMAP_H
+
+#include <commonlib/bsd/cb_err.h>
+#include <stddef.h>
+
+/* Looks for area with |name| in FlashMap. Requires lib_sysinfo.fmap_cache. */
+cb_err_t fmap_locate_area(const char *name, size_t *offset, size_t *size);
+
+#endif /* _FMAP_H */