1 files changed, 11 insertions, 27 deletions

diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index 1c1d94bdfa..63221ef981 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -28,23 +28,7 @@
 #include <device/pci_ids.h>
 #include <string.h>
 
-#define DUMP_ACPI_TABLES 0
-
-#if DUMP_ACPI_TABLES == 1
-
-static void dump_mem(u32 start, u32 end)
-{
-	u32 i;
-	print_debug("dump_mem:");
-	for (i = start; i < end; i++) {
-		if ((i & 0xf) == 0) {
-			printk(BIOS_DEBUG, "\n%08x:", i);
-		}
-		printk(BIOS_DEBUG, " %02x", (u8)*((u8 *)i));
-	}
-	print_debug("\n");
-}
-#endif
+#include <lib.h> /* used for hexdump for CONFIG_DEBUG_ACPI */
 
 extern const unsigned char AmlCode[];
 
@@ -295,31 +279,31 @@ unsigned long write_acpi_tables(unsigned long start)
 	current += ssdt->length;
 	acpi_add_table(rsdp, ssdt);
 
-#if DUMP_ACPI_TABLES == 1
+#if defined(CONFIG_DEBUG_ACPI)
 	printk(BIOS_DEBUG, "rsdp\n");
-	dump_mem(rsdp, ((void *)rsdp) + sizeof(acpi_rsdp_t));
+	hexdump(rsdp, sizeof(acpi_rsdp_t));
 
 	printk(BIOS_DEBUG, "rsdt\n");
-	dump_mem(rsdt, ((void *)rsdt) + sizeof(acpi_rsdt_t));
+	hexdump(rsdt, sizeof(acpi_rsdt_t));
 
 	printk(BIOS_DEBUG, "madt\n");
-	dump_mem(madt, ((void *)madt) + madt->header.length);
+	hexdump(madt, madt->header.length);
 
 	printk(BIOS_DEBUG, "srat\n");
-	dump_mem(srat, ((void *)srat) + srat->header.length);
+	hexdump(srat, srat->header.length);
 
 	printk(BIOS_DEBUG, "slit\n");
-	dump_mem(slit, ((void *)slit) + slit->header.length);
+	hexdump(slit, slit->header.length);
 
 	printk(BIOS_DEBUG, "ssdt\n");
-	dump_mem(ssdt, ((void *)ssdt) + ssdt->length);
+	hexdump(ssdt, ssdt->length);
 
 	printk(BIOS_DEBUG, "fadt\n");
-	dump_mem(fadt, ((void *)fadt) + fadt->header.length);
+	hexdump(fadt, fadt->header.length);
 
 	printk(BIOS_DEBUG, "hest\n");
-	dump_mem(hest, ((void *)hest) + hest->header.length);
-#endif
+	hexdump(hest, hest->header.length);
+#endif /* CONFIG_DEBUG_ACPI */
 
 	printk(BIOS_INFO, "ACPI: done.\n");
 	return current;