diff --git a/src/include/lib.h b/src/include/lib.h
index 772a66f317..0cb2c0c8d2 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -39,6 +39,9 @@ int ram_check_nodie(unsigned long start, unsigned long stop);
 int ram_check_noprint_nodie(unsigned long start, unsigned long stop);
 void quick_ram_check(void);
 
+/* Defined in primitive_memtest.c */
+int primitive_memtest(uintptr_t base, uintptr_t size);
+
 /* Defined in src/lib/stack.c */
 int checkstack(void *top_of_stack, int core);
 
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index ec3c2f4cc4..9b5f56bb74 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -33,6 +33,8 @@ romstage-$(CONFIG_I2C_TPM) += delay.c
 romstage-y += cbfs.c cbfs_core.c
 romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
 romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c
+romstage-$(CONFIG_PRIMITIVE_MEMTEST) += primitive_memtest.c
+ramstage-$(CONFIG_PRIMITIVE_MEMTEST) += primitive_memtest.c
 romstage-$(CONFIG_CACHE_AS_RAM) += ramtest.c
 
 ifeq ($(CONFIG_EARLY_CBMEM_INIT),y)
diff --git a/src/lib/primitive_memtest.c b/src/lib/primitive_memtest.c
new file mode 100644
index 0000000000..d59d25fd92
--- /dev/null
+++ b/src/lib/primitive_memtest.c
@@ -0,0 +1,65 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 Google Inc.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <inttypes.h>
+#include <lib.h>
+#include <console/console.h>
+
+int primitive_memtest(uintptr_t base, uintptr_t size)
+{
+	uintptr_t *p;
+	uintptr_t i;
+	int bad = 0;
+
+	printk(BIOS_SPEW, "Performing primitive memory test.\n");
+	printk(BIOS_SPEW, "DRAM start: 0x%08x, DRAM size: 0x%08x", base, size);
+	for(i = base; i < base + (size - 1) - sizeof(p); i += sizeof(p)) {
+		if (i % 0x100000 == 0) {
+			if ((i % 0x800000) == 0)
+				printk(BIOS_SPEW, "\n");
+			else if (i != 0)
+				printk(BIOS_SPEW, " ");
+			printk(BIOS_SPEW, "0x%08x", i);
+		}
+		p = (uintptr_t *)i;
+		*p = i;
+	}
+
+	printk(BIOS_SPEW, "\n\nReading back DRAM content");
+	for(i = base; i < base + (size - 1) - sizeof(p); i += sizeof(p)) {
+		if (i % 0x100000 == 0) {
+			if ((i % 0x800000) == 0)
+				printk(BIOS_SPEW, "\n");
+			else if (i != 0)
+				printk(BIOS_SPEW, " ");
+			printk(BIOS_SPEW, "0x%08x", i);
+		}
+
+		p = (uintptr_t *)i;
+		if (*p != i) {
+			printk(BIOS_SPEW, "\n0x%08zx: got 0x%zx\n", i, *p);
+			bad++;
+		}
+	}
+
+	printk(BIOS_SPEW, "\n");
+	printk(BIOS_SPEW, "%d errors\n", bad);
+
+	return bad;
+}