diff --git a/src/soc/amd/common/block/include/amdblocks/image.h b/src/soc/amd/common/block/include/amdblocks/image.h
new file mode 100644
index 0000000000..ccfcac5a5d
--- /dev/null
+++ b/src/soc/amd/common/block/include/amdblocks/image.h
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Silverback, ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __AMD_IMAGE_H__
+#define __AMD_IMAGE_H__
+
+#include <stdint.h>
+
+void *amd_find_image(const void *start_address, const void *end_address,
+			uint32_t alignment, const char name[8]);
+
+#endif /* __AMD_IMAGE_H__ */
diff --git a/src/soc/amd/common/block/pi/Makefile.inc b/src/soc/amd/common/block/pi/Makefile.inc
index 65386f2972..ba0812343b 100644
--- a/src/soc/amd/common/block/pi/Makefile.inc
+++ b/src/soc/amd/common/block/pi/Makefile.inc
@@ -3,11 +3,13 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_PI),y)
 romstage-y += agesawrapper.c
 romstage-y += def_callouts.c
 romstage-y += heapmanager.c
+romstage-y += image.c
 
 ramstage-y += agesawrapper.c
 ramstage-y += amd_late_init.c
 ramstage-$(CONFIG_HAVE_ACPI_RESUME) += amd_resume_final.c
 ramstage-y += def_callouts.c
 ramstage-y += heapmanager.c
+ramstage-y += image.c
 
 endif
diff --git a/src/soc/amd/common/block/pi/image.c b/src/soc/amd/common/block/pi/image.c
new file mode 100644
index 0000000000..dca1963666
--- /dev/null
+++ b/src/soc/amd/common/block/pi/image.c
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Silverback, ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <agesa_headers.h>
+#include <amdblocks/image.h>
+
+/* Check if the image has the desired module. */
+static bool validate_image(void *module_chain, const char module_signature[8])
+{
+	AMD_MODULE_HEADER *mod_ptr = (AMD_MODULE_HEADER *)module_chain;
+	uint64_t signature = *(uint64_t *)module_signature;
+	char *checking_str;
+
+	while ((mod_ptr != NULL) &&
+	  (MODULE_SIGNATURE == *(uint32_t *)&mod_ptr->ModuleHeaderSignature)) {
+		checking_str = (char *)&mod_ptr->ModuleIdentifier;
+		if (signature == *(uint64_t *)checking_str)
+			return true;
+		mod_ptr = (AMD_MODULE_HEADER *)mod_ptr->NextBlock;
+	}
+	return false;
+}
+
+/*
+ * Find an image that has the desired module. The image is aligned within
+ * a given range.
+ */
+void *amd_find_image(const void *start_address, const void *end_address,
+			uint32_t alignment, const char name[8])
+{
+	uint8_t *current_ptr = (uint8_t *)start_address;
+	uint8_t *start = (uint8_t *)start_address;
+	uint8_t *end = (uint8_t *)end_address;
+	AMD_IMAGE_HEADER *image_ptr;
+
+	while ((current_ptr >= start) && (current_ptr < end)) {
+		if (IMAGE_SIGNATURE == *((uint32_t *)current_ptr)) {
+			image_ptr = (AMD_IMAGE_HEADER *) current_ptr;
+
+			/* Check if the image has the desired module */
+			if (validate_image((void *)image_ptr->ModuleInfoOffset,
+					   name))
+				return current_ptr;
+		}
+		current_ptr += alignment;
+	}
+	return NULL;
+}