diff --git a/src/console/printk.c b/src/console/printk.c
@@ -21,14 +21,53 @@
 #include <smp/node.h>
 #include <stddef.h>
 #include <trace.h>
+#include <timer.h>
 
-#if (!defined(__PRE_RAM__) && CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK)) || !CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK)
 DECLARE_SPIN_LOCK(console_lock)
-#endif
+
+#define TRACK_CONSOLE_TIME (!ENV_SMM && CONFIG(HAVE_MONOTONIC_TIMER))
+
+static struct mono_time mt_start, mt_stop;
+static long console_usecs;
+
+static void console_time_run(void)
+{
+	if (TRACK_CONSOLE_TIME && boot_cpu())
+		timer_monotonic_get(&mt_start);
+}
+
+static void console_time_stop(void)
+{
+	if (TRACK_CONSOLE_TIME && boot_cpu()) {
+		timer_monotonic_get(&mt_stop);
+		console_usecs += mono_time_diff_microseconds(&mt_start, &mt_stop);
+	}
+}
+
+void console_time_report(void)
+{
+	if (!TRACK_CONSOLE_TIME)
+		return;
+
+	printk(BIOS_DEBUG, "Accumulated console time in " ENV_STRING " %ld ms\n",
+		DIV_ROUND_CLOSEST(console_usecs, USECS_PER_MSEC));
+}
+
+long console_time_get_and_reset(void)
+{
+	if (!TRACK_CONSOLE_TIME)
+		return 0;
+
+	long elapsed = console_usecs;
+	console_usecs = 0;
+	return elapsed;
+}
 
 void do_putchar(unsigned char byte)
 {
+	console_time_run();
 	console_tx_byte(byte);
+	console_time_stop();
 }
 
 static void wrap_putchar(unsigned char byte, void *data)
@@ -53,13 +92,9 @@ int do_vprintk(int msg_level, const char *fmt, va_list args)
 		return 0;
 
 	DISABLE_TRACE;
-#ifdef __PRE_RAM__
-#if CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK)
-	spin_lock(romstage_console_lock());
-#endif
-#else
 	spin_lock(&console_lock);
-#endif
+
+	console_time_run();
 
 	if (log_this == CONSOLE_LOG_FAST) {
 		i = vtxprintf(wrap_putchar_cbmemc, fmt, args, NULL);
@@ -68,13 +103,9 @@ int do_vprintk(int msg_level, const char *fmt, va_list args)
 		console_tx_flush();
 	}
 
-#ifdef __PRE_RAM__
-#if CONFIG(HAVE_ROMSTAGE_CONSOLE_SPINLOCK)
-	spin_unlock(romstage_console_lock());
-#endif
-#else
+	console_time_stop();
+
 	spin_unlock(&console_lock);
-#endif
 	ENABLE_TRACE;
 
 	return i;

diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
@@ -20,10 +20,6 @@
 
 #define call_tx(x) tx_byte(x, data)
 
-#if !CONFIG(ARCH_MIPS)
-#define SUPPORT_64BIT_INTS
-#endif
-
 #define ZEROPAD	1		/* pad with zero */
 #define SIGN	2		/* unsigned/signed long */
 #define PLUS	4		/* show plus */
@@ -40,20 +36,8 @@ static int number(void (*tx_byte)(unsigned char byte, void *data),
 	const char *digits = "0123456789abcdef";
 	int i;
 	int count = 0;
-#ifdef SUPPORT_64BIT_INTS
 	unsigned long long num = inum;
 	long long snum = num;
-#else
-	unsigned long num = (unsigned long)inum;
-	long snum = (long)num;
-
-	if (num != inum) {
-		/* Alert user to an incorrect result by printing #^!. */
-		call_tx('#');
-		call_tx('^');
-		call_tx('!');
-	}
-#endif
 
 	if (type & LARGE)
 		digits = "0123456789ABCDEF";

diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
@@ -6,14 +6,6 @@ source "src/cpu/*/Kconfig"
 
 if ARCH_X86
 
-config CAR_GLOBAL_MIGRATION
-	bool
-	default n
-	help
-	  This option is selected if there is need to migrate CAR globals.
-	  All stages which use CAR globals can directly access the variables
-	  from their linked addresses.
-
 config DCACHE_RAM_BASE
 	hex
 

diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
@@ -4,10 +4,8 @@
 subdirs-y += allwinner
 subdirs-y += amd
 subdirs-y += armltd
-subdirs-y += imgtec
 subdirs-y += intel
 subdirs-y += ti
-subdirs-y += via
 subdirs-$(CONFIG_ARCH_X86) += x86
 subdirs-$(CONFIG_CPU_QEMU_X86) += qemu-x86
 
@@ -61,9 +59,4 @@ $(obj)/cpu_microcode_blob.bin: $$(wildcard $$(cpu_microcode_bins))
 
 cpu_microcode_blob.bin-file ?= $(obj)/cpu_microcode_blob.bin
 cpu_microcode_blob.bin-type := microcode
-
-ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC),)
-cpu_microcode_blob.bin-COREBOOT-position := $(CONFIG_CPU_MICROCODE_CBFS_LOC)
-else
 cpu_microcode_blob.bin-align := 16
-endif
diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig
@@ -1,12 +1,2 @@
-source src/cpu/amd/socket_AM2r2/Kconfig
-source src/cpu/amd/socket_AM3/Kconfig
-source src/cpu/amd/socket_C32/Kconfig
-source src/cpu/amd/socket_FM2/Kconfig
-source src/cpu/amd/socket_G34/Kconfig
-source src/cpu/amd/socket_ASB2/Kconfig
-source src/cpu/amd/socket_F_1207/Kconfig
-
-source src/cpu/amd/family_10h-family_15h/Kconfig
-
-source src/cpu/amd/agesa/Kconfig
-source src/cpu/amd/pi/Kconfig
+source "src/cpu/amd/agesa/Kconfig"
+source "src/cpu/amd/pi/Kconfig"
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
@@ -1,10 +1,2 @@
-subdirs-$(CONFIG_CPU_AMD_SOCKET_F_1207) += socket_F_1207
-subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2R2) += socket_AM2r2
-subdirs-$(CONFIG_CPU_AMD_SOCKET_AM3) += socket_AM3
-subdirs-$(CONFIG_CPU_AMD_SOCKET_ASB2) += socket_ASB2
-subdirs-$(CONFIG_CPU_AMD_SOCKET_C32_NON_AGESA) += socket_C32
-subdirs-$(CONFIG_CPU_AMD_SOCKET_FM2_NON_AGESA) += socket_FM2
-subdirs-$(CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA) += socket_G34
-
 subdirs-$(CONFIG_CPU_AMD_AGESA) += agesa
 subdirs-$(CONFIG_CPU_AMD_PI) += pi
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
@@ -13,7 +13,6 @@
 
 config CPU_AMD_AGESA
 	bool
-	default y if CPU_AMD_AGESA_FAMILY12
 	default y if CPU_AMD_AGESA_FAMILY14
 	default y if CPU_AMD_AGESA_FAMILY15_TN
 	default y if CPU_AMD_AGESA_FAMILY16_KB
@@ -27,8 +26,10 @@ config CPU_AMD_AGESA
 	select UDELAY_LAPIC
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
+	select CBMEM_STAGE_CACHE if HAVE_ACPI_RESUME
 	select SMM_ASEG
 	select NO_FIXED_XIP_ROM_SIZE
+	select SSE2
 
 if CPU_AMD_AGESA
 
@@ -62,11 +63,10 @@ config S3_DATA_POS
 
 config S3_DATA_SIZE
 	int
-	default 32768
+	default 8192
 
 endif # CPU_AMD_AGESA
 
-source src/cpu/amd/agesa/family12/Kconfig
-source src/cpu/amd/agesa/family14/Kconfig
-source src/cpu/amd/agesa/family15tn/Kconfig
-source src/cpu/amd/agesa/family16kb/Kconfig
+source "src/cpu/amd/agesa/family14/Kconfig"
+source "src/cpu/amd/agesa/family15tn/Kconfig"
+source "src/cpu/amd/agesa/family16kb/Kconfig"
diff --git a/src/cpu/amd/agesa/Makefile.inc b/src/cpu/amd/agesa/Makefile.inc
@@ -10,7 +10,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY12) += family12
 subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += family14
 subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY15_TN) += family15tn
 subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY16_KB) += family16kb

diff --git a/src/cpu/amd/agesa/family12/Kconfig b/src/cpu/amd/agesa/family12/Kconfig
diff --git a/src/cpu/amd/agesa/family12/Makefile.inc b/src/cpu/amd/agesa/family12/Makefile.inc
diff --git a/src/cpu/amd/agesa/family12/chip_name.c b/src/cpu/amd/agesa/family12/chip_name.c
diff --git a/src/cpu/amd/agesa/family12/fixme.c b/src/cpu/amd/agesa/family12/fixme.c
diff --git a/src/cpu/amd/agesa/family12/model_12_init.c b/src/cpu/amd/agesa/family12/model_12_init.c
diff --git a/src/cpu/amd/agesa/family12/romstage.c b/src/cpu/amd/agesa/family12/romstage.c
diff --git a/src/cpu/amd/agesa/family14/acpi/cpu.asl b/src/cpu/amd/agesa/family14/acpi/cpu.asl
@@ -16,14 +16,19 @@
  *
  */
 Scope (\_PR) {		/* define processor scope */
-
-	Device (C000) {
-	Name (_HID, "ACPI0007")
-	Name (_UID, 0)
+	Processor(
+		C000,		/* name space name, align with BLDCFG_PROCESSOR_SCOPE_NAME[01] */
+		0,		/* Unique number for this processor */
+		0x810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
 
-	Device (C001) {
-	Name (_HID, "ACPI0007")
-	Name (_UID, 1)
+	Processor(
+		C001,		/* name space name */
+		1,		/* Unique number for this processor */
+		0x810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
 } /* End _PR scope */
diff --git a/src/cpu/amd/agesa/family15tn/acpi/cpu.asl b/src/cpu/amd/agesa/family15tn/acpi/cpu.asl
@@ -11,49 +11,66 @@
  * GNU General Public License for more details.
  */
 
-/*
- * Processor Object
- *
- */
-Scope (\_PR) {	/* define processor scope */
-
-	Device (P000) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 0)
-	}
-
-	Device (P001) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 1)
-	}
-
-	Device (P002) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 2)
-	}
-
-	Device (P003) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 3)
-	}
-
-	Device (P004) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 4)
-	}
-
-	Device (P005) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 5)
-	}
-
-	Device (P006) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 6)
-	}
+	/*
+	 * Processor Object
+	 *
+	 */
+	Scope (\_PR) {		/* define processor scope */
+		Processor(
+			P000,		/* name space name */
+			0,		/* Unique number for this processor */
+			0x810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
 
-	Device (P007) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 7)
-	}
-} /* End _PR scope */
+		Processor(
+			P001,		/* name space name */
+			1,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P002,		/* name space name */
+			2,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P003,		/* name space name */
+			3,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P004,		/* name space name */
+			4,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P005,		/* name space name */
+			5,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P006,		/* name space name */
+			6,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P007,		/* name space name */
+			7,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+	} /* End _PR scope */
diff --git a/src/cpu/amd/agesa/family16kb/acpi/cpu.asl b/src/cpu/amd/agesa/family16kb/acpi/cpu.asl
@@ -15,44 +15,62 @@
  * Processor Object
  *
  */
-Scope (\_PR) {/* define processor scope */
-	Device (P000) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 0)
+Scope (\_PR) {		/* define processor scope */
+	Processor(
+		P000,		/* name space name */
+		0,			/* Unique number for this processor */
+		0x810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
 
-	Device (P001) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 1)
+	Processor(
+		P001,		/* name space name */
+		1,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P002) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 2)
+	Processor(
+		P002,		/* name space name */
+		2,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P003) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 3)
+	Processor(
+		P003,		/* name space name */
+		3,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P004) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 4)
+	Processor(
+		P004,		/* name space name */
+		4,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P005) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 5)
+	Processor(
+		P005,		/* name space name */
+		5,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P006) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 6)
+	Processor(
+		P006,		/* name space name */
+		6,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P007) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 7)
+	Processor(
+		P007,		/* name space name */
+		7,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
 } /* End _PR scope */
diff --git a/src/cpu/amd/car/cache_as_ram.inc b/src/cpu/amd/car/cache_as_ram.inc
diff --git a/src/cpu/amd/car/disable_cache_as_ram.c b/src/cpu/amd/car/disable_cache_as_ram.c
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
diff --git a/src/cpu/amd/family_10h-family_15h/Makefile.inc b/src/cpu/amd/family_10h-family_15h/Makefile.inc
diff --git a/src/cpu/amd/family_10h-family_15h/defaults.h b/src/cpu/amd/family_10h-family_15h/defaults.h
diff --git a/src/cpu/amd/family_10h-family_15h/fidvid.c b/src/cpu/amd/family_10h-family_15h/fidvid.c
diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c
diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.h b/src/cpu/amd/family_10h-family_15h/init_cpus.h
diff --git a/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c
diff --git a/src/cpu/amd/family_10h-family_15h/monotonic_timer.c b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c
diff --git a/src/cpu/amd/family_10h-family_15h/powernow_acpi.c b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
diff --git a/src/cpu/amd/family_10h-family_15h/processor_name.c b/src/cpu/amd/family_10h-family_15h/processor_name.c
diff --git a/src/cpu/amd/family_10h-family_15h/ram_calc.c b/src/cpu/amd/family_10h-family_15h/ram_calc.c
diff --git a/src/cpu/amd/family_10h-family_15h/ram_calc.h b/src/cpu/amd/family_10h-family_15h/ram_calc.h
diff --git a/src/cpu/amd/family_10h-family_15h/tsc_freq.c b/src/cpu/amd/family_10h-family_15h/tsc_freq.c
diff --git a/src/cpu/amd/family_10h-family_15h/update_microcode.c b/src/cpu/amd/family_10h-family_15h/update_microcode.c
diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c
diff --git a/src/cpu/amd/pi/00630F01/acpi/cpu.asl b/src/cpu/amd/pi/00630F01/acpi/cpu.asl
@@ -11,49 +11,94 @@
  * GNU General Public License for more details.
  */
 
-/*
- * Processor Object
- *
- */
-Scope (\_PR) {	/* define processor scope */
-
-	Device (P000) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 0)
-	}
-
-	Device (P001) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 1)
-	}
-
-	Device (P002) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 2)
-	}
-
-	Device (P003) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 3)
-	}
-
-	Device (P004) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 4)
-	}
-
-	Device (P005) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 5)
-	}
-
-	Device (P006) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 6)
-	}
+	/*
+	 * Processor Object
+	 *
+	 */
+	Scope (\_PR) {      /* define processor scope */
+		Processor(
+			P000,       /* name space name */
+			0,          /* Unique core number for this processor within a socket */
+			0x810,      /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
 
-	Device (P007) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 7)
-	}
-} /* End _PR scope */
+		Processor(
+			P001,       /* name space name */
+			1,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P002,       /* name space name */
+			2,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P003,       /* name space name */
+			3,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P004,       /* name space name */
+			4,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P005,       /* name space name */
+			5,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P006,       /* name space name */
+			6,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P007,       /* name space name */
+			7,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P008,       /* name space name */
+			8,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P009,       /* name space name */
+			9,          /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P010,       /* name space name */
+			10,         /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P011,       /* name space name */
+			11,         /* Unique core number for this processor within a socket */
+			0x0810,     /* PBLK system I/O address !hardcoded! */
+			0x06        /* PBLKLEN for boot processor */
+			) {
+		}
+	} /* End _PR scope */
diff --git a/src/cpu/amd/pi/00660F01/acpi/cpu.asl b/src/cpu/amd/pi/00660F01/acpi/cpu.asl
@@ -15,45 +15,62 @@
  * Processor Object
  *
  */
-Scope (\_PR) {	/* define processor scope */
-
-	Device (P000) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 0)
+Scope (\_PR) {		/* define processor scope */
+	Processor(
+		P000,		/* name space name */
+		0,			/* Unique number for this processor */
+		0x810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
 
-	Device (P001) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 1)
+	Processor(
+		P001,		/* name space name */
+		1,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P002) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 2)
+	Processor(
+		P002,		/* name space name */
+		2,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P003) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 3)
+	Processor(
+		P003,		/* name space name */
+		3,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P004) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 4)
+	Processor(
+		P004,		/* name space name */
+		4,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P005) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 5)
+	Processor(
+		P005,		/* name space name */
+		5,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P006) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 6)
+	Processor(
+		P006,		/* name space name */
+		6,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
-
-	Device (P007) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 7)
+	Processor(
+		P007,		/* name space name */
+		7,			/* Unique number for this processor */
+		0x0810,		/* PBLK system I/O address !hardcoded! */
+		0x06		/* PBLKLEN for boot processor */
+		) {
 	}
 } /* End _PR scope */
diff --git a/src/cpu/amd/pi/00730F01/acpi/cpu.asl b/src/cpu/amd/pi/00730F01/acpi/cpu.asl
@@ -11,49 +11,66 @@
  * GNU General Public License for more details.
  */
 
-/*
- * Processor Object
- *
- */
-Scope (\_PR) {	/* define processor scope */
-
-	Device (P000) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 0)
-	}
-
-	Device (P001) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 1)
-	}
-
-	Device (P002) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 2)
-	}
-
-	Device (P003) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 3)
-	}
-
-	Device (P004) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 4)
-	}
-
-	Device (P005) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 5)
-	}
-
-	Device (P006) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 6)
-	}
+	/*
+	 * Processor Object
+	 *
+	 */
+	Scope (\_PR) {		/* define processor scope */
+		Processor(
+			P000,		/* name space name */
+			0,		/* Unique number for this processor */
+			0x810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
 
-	Device (P007) {
-	Name(_HID, "ACPI0007")
-	Name(_UID, 7)
-	}
-} /* End _PR scope */
+		Processor(
+			P001,		/* name space name */
+			1,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P002,		/* name space name */
+			2,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P003,		/* name space name */
+			3,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P004,		/* name space name */
+			4,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P005,		/* name space name */
+			5,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P006,		/* name space name */
+			6,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+		Processor(
+			P007,		/* name space name */
+			7,		/* Unique number for this processor */
+			0x0810,		/* PBLK system I/O address !hardcoded! */
+			0x06		/* PBLKLEN for boot processor */
+			) {
+		}
+	} /* End _PR scope */
diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig
@@ -26,15 +26,12 @@ config CPU_AMD_PI
 	select UDELAY_LAPIC
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
-	select CAR_GLOBAL_MIGRATION if BINARYPI_LEGACY_WRAPPER
 	select SMM_ASEG
 	select NO_FIXED_XIP_ROM_SIZE
+	select SSE2
 
 if CPU_AMD_PI
 
-config BINARYPI_LEGACY_WRAPPER
-	def_bool n
-
 config UDELAY_LAPIC_FIXED_FSB
 	int
 	default 200
@@ -51,16 +48,8 @@ config DCACHE_RAM_SIZE
 	hex
 	default 0x10000
 
-config S3_DATA_POS
-	hex
-	default 0xFFFF0000
-
-config S3_DATA_SIZE
-	int
-	default 32768
-
 endif # CPU_AMD_PI
 
-source src/cpu/amd/pi/00630F01/Kconfig
-source src/cpu/amd/pi/00730F01/Kconfig
-source src/cpu/amd/pi/00660F01/Kconfig
+source "src/cpu/amd/pi/00630F01/Kconfig"
+source "src/cpu/amd/pi/00730F01/Kconfig"
+source "src/cpu/amd/pi/00660F01/Kconfig"
diff --git a/src/cpu/amd/pi/Makefile.inc b/src/cpu/amd/pi/Makefile.inc
@@ -14,9 +14,3 @@
 subdirs-$(CONFIG_CPU_AMD_PI_00630F01) += 00630F01
 subdirs-$(CONFIG_CPU_AMD_PI_00730F01) += 00730F01
 subdirs-$(CONFIG_CPU_AMD_PI_00660F01) += 00660F01
-
-ifeq ($(CONFIG_BINARYPI_LEGACY_WRAPPER), y)
-cpu_incs-y += $(src)/drivers/amd/agesa/cache_as_ram.S
-romstage-y += romstage.c
-ramstage-y += amd_late_init.c
-endif
diff --git a/src/cpu/amd/pi/amd_late_init.c b/src/cpu/amd/pi/amd_late_init.c
diff --git a/src/cpu/amd/pi/romstage.c b/src/cpu/amd/pi/romstage.c
diff --git a/src/cpu/amd/quadcore/Makefile.inc b/src/cpu/amd/quadcore/Makefile.inc
diff --git a/src/cpu/amd/quadcore/amd_sibling.c b/src/cpu/amd/quadcore/amd_sibling.c