11 files changed, 22 insertions, 22 deletions
diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig
index 0e2683401c..2f4ff33aec 100644
--- a/src/cpu/amd/Kconfig
+++ b/src/cpu/amd/Kconfig
@@ -22,4 +22,4 @@ source src/cpu/amd/model_lx/Kconfig
 
 source src/cpu/amd/sc520/Kconfig
 
-source src/cpu/amd/agesa_wrapper/Kconfig
+source src/cpu/amd/agesa/Kconfig
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
index 031e921a2b..dfa6d1ea2b 100644
--- a/src/cpu/amd/Makefile.inc
+++ b/src/cpu/amd/Makefile.inc
@@ -14,5 +14,5 @@ subdirs-$(CONFIG_CPU_AMD_LX) += model_lx
 subdirs-$(CONFIG_CPU_AMD_SC520) += sc520
 subdirs-$(CONFIG_CPU_AMD_SOCKET_S1G1) += socket_S1G1
 
-subdirs-$(CONFIG_AMD_AGESA) += agesa_wrapper
+subdirs-$(CONFIG_AMD_AGESA) += agesa
 subdirs-$(CONFIG_AMD_AGESA) += ../../vendorcode/amd/agesa
diff --git a/src/cpu/amd/agesa_wrapper/Kconfig b/src/cpu/amd/agesa/Kconfig
index 513c06a116..2133f89f94 100644
--- a/src/cpu/amd/agesa_wrapper/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -17,4 +17,4 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-source src/cpu/amd/agesa_wrapper/family14/Kconfig
+source src/cpu/amd/agesa/family14/Kconfig
diff --git a/src/cpu/amd/agesa_wrapper/Makefile.inc b/src/cpu/amd/agesa/Makefile.inc
index 8780b8e673..222bcf917e 100644
--- a/src/cpu/amd/agesa_wrapper/Makefile.inc
+++ b/src/cpu/amd/agesa/Makefile.inc
@@ -16,4 +16,4 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
-subdirs-$(CONFIG_CPU_AMD_AGESA_WRAPPER_FAMILY14) += family14
+subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY14) += family14
diff --git a/src/cpu/amd/agesa_wrapper/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index ce633e00a3..8f3e766e6f 100644
--- a/src/cpu/amd/agesa_wrapper/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -17,58 +17,58 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-config CPU_AMD_AGESA_WRAPPER_FAMILY14
+config CPU_AMD_AGESA_FAMILY14
 	bool
 	select PCI_IO_CFG_EXT
 
 config CPU_ADDR_BITS
 	int
 	default 36
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 config CPU_SOCKET_TYPE
 	hex
 	default 0x10
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 # DDR2 and REG
 config DIMM_SUPPORT
 	hex
 	default 0x0104
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 config EXT_RT_TBL_SUPPORT
 	bool
 	default n
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 config EXT_CONF_SUPPORT
 	bool
 	default n
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 config CBB
 	hex
 	default 0x0
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 config CDB
 	hex
 	default 0x18
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 config XIP_ROM_BASE
 	hex
 	default 0xfff80000
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
+	depends on CPU_AMD_AGESA_FAMILY14
 
 config XIP_ROM_SIZE
 	hex
 	default 0x80000
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14
-	
+	depends on CPU_AMD_AGESA_FAMILY14
+
 config HAVE_INIT_TIMER
 	bool
 	default y
-	depends on CPU_AMD_AGESA_WRAPPER_FAMILY14 
-		
+	depends on CPU_AMD_AGESA_FAMILY14
+
diff --git a/src/cpu/amd/agesa_wrapper/family14/Makefile.inc b/src/cpu/amd/agesa/family14/Makefile.inc
index 59728b5584..ea6c51a1c3 100644
--- a/src/cpu/amd/agesa_wrapper/family14/Makefile.inc
+++ b/src/cpu/amd/agesa/family14/Makefile.inc
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
- 
+
 ramstage-y += chip_name.c
 driver-y += model_14_init.c
 
@@ -279,4 +279,4 @@ subdirs-y += ../../../x86/pae
 subdirs-y += ../../../x86/smm
 
 ramstage-y += apic_timer.c
-cpu_incs += $(src)/cpu/amd/agesa_wrapper/family14/cache_as_ram.inc
+cpu_incs += $(src)/cpu/amd/agesa/family14/cache_as_ram.inc
diff --git a/src/cpu/amd/agesa_wrapper/family14/apic_timer.c b/src/cpu/amd/agesa/family14/apic_timer.c
index 26d3f88e49..26d3f88e49 100644
--- a/src/cpu/amd/agesa_wrapper/family14/apic_timer.c
+++ b/src/cpu/amd/agesa/family14/apic_timer.c
diff --git a/src/cpu/amd/agesa_wrapper/family14/cache_as_ram.inc b/src/cpu/amd/agesa/family14/cache_as_ram.inc
index 98da3cbffb..98da3cbffb 100644
--- a/src/cpu/amd/agesa_wrapper/family14/cache_as_ram.inc
+++ b/src/cpu/amd/agesa/family14/cache_as_ram.inc
diff --git a/src/cpu/amd/agesa_wrapper/family14/chip.h b/src/cpu/amd/agesa/family14/chip.h
index d7c175361f..d67184e306 100644
--- a/src/cpu/amd/agesa_wrapper/family14/chip.h
+++ b/src/cpu/amd/agesa/family14/chip.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations cpu_amd_agesa_wrapper_family14_ops;
+extern struct chip_operations cpu_amd_agesa_family14_ops;
 
-struct cpu_amd_agesa_wrapper_family14_config {
+struct cpu_amd_agesa_family14_config {
 };
diff --git a/src/cpu/amd/agesa_wrapper/family14/chip_name.c b/src/cpu/amd/agesa/family14/chip_name.c
index 1217ebc4f8..2c296f59d3 100644
--- a/src/cpu/amd/agesa_wrapper/family14/chip_name.c
+++ b/src/cpu/amd/agesa/family14/chip_name.c
@@ -20,6 +20,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations cpu_amd_agesa_wrapper_family14_ops = {
+struct chip_operations cpu_amd_agesa_family14_ops = {
 	CHIP_NAME("AMD CPU Family 14h")
 };
diff --git a/src/cpu/amd/agesa_wrapper/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c
index c94e2150aa..c94e2150aa 100644
--- a/src/cpu/amd/agesa_wrapper/family14/model_14_init.c
+++ b/src/cpu/amd/agesa/family14/model_14_init.c