22 files changed, 33 insertions, 33 deletions

diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig
index 2f4ff33aec..dd78ca96e3 100644
--- a/src/cpu/amd/Kconfig
+++ b/src/cpu/amd/Kconfig
@@ -16,9 +16,9 @@ source src/cpu/amd/socket_S1G1/Kconfig
 
 source src/cpu/amd/model_fxx/Kconfig
 source src/cpu/amd/model_10xxx/Kconfig
-source src/cpu/amd/model_gx1/Kconfig
-source src/cpu/amd/model_gx2/Kconfig
-source src/cpu/amd/model_lx/Kconfig
+source src/cpu/amd/geode_gx1/Kconfig
+source src/cpu/amd/geode_gx2/Kconfig
+source src/cpu/amd/geode_lx/Kconfig
 
 source src/cpu/amd/sc520/Kconfig
 
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
index e695473e58..2ea376a2f8 100644
--- a/src/cpu/amd/Makefile.inc
+++ b/src/cpu/amd/Makefile.inc
@@ -8,9 +8,9 @@ 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) += socket_C32
-subdirs-$(CONFIG_CPU_AMD_GX1) += model_gx1
-subdirs-$(CONFIG_CPU_AMD_GX2) += model_gx2
-subdirs-$(CONFIG_CPU_AMD_LX) += model_lx
+subdirs-$(CONFIG_CPU_AMD_GEODE_GX1) += geode_gx1
+subdirs-$(CONFIG_CPU_AMD_GEODE_GX2) += geode_gx2
+subdirs-$(CONFIG_CPU_AMD_GEODE_LX) += geode_lx
 subdirs-$(CONFIG_CPU_AMD_SC520) += sc520
 subdirs-$(CONFIG_CPU_AMD_SOCKET_S1G1) += socket_S1G1
 
diff --git a/src/cpu/amd/model_gx1/Kconfig b/src/cpu/amd/geode_gx1/Kconfig
index c1c9b286a6..4a90c26d6e 100644
--- a/src/cpu/amd/model_gx1/Kconfig
+++ b/src/cpu/amd/geode_gx1/Kconfig
@@ -17,16 +17,17 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-config CPU_AMD_GX1
+config CPU_AMD_GEODE_GX1
 	bool
 
+if CPU_AMD_GEODE_GX1
+
 config DCACHE_RAM_BASE
 	hex
 	default 0xc0000
-	depends on CPU_AMD_GX1
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x01000
-	depends on CPU_AMD_GX1
 
+endif # CPU_AMD_GEODE_GX1
diff --git a/src/cpu/amd/model_gx1/Makefile.inc b/src/cpu/amd/geode_gx1/Makefile.inc
index bf543a4665..d5bb1ef5ad 100644
--- a/src/cpu/amd/model_gx1/Makefile.inc
+++ b/src/cpu/amd/geode_gx1/Makefile.inc
@@ -22,7 +22,7 @@ subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
-driver-y += model_gx1_init.c
+driver-y += geode_gx1_init.c
 
-cpu_incs += $(src)/cpu/amd/model_gx1/cpu_setup.inc
-cpu_incs += $(src)/cpu/amd/model_gx1/gx_setup.inc
+cpu_incs += $(src)/cpu/amd/geode_gx1/cpu_setup.inc
+cpu_incs += $(src)/cpu/amd/geode_gx1/gx_setup.inc
diff --git a/src/cpu/amd/model_gx1/cpu_setup.inc b/src/cpu/amd/geode_gx1/cpu_setup.inc
index d701f8d226..d701f8d226 100644
--- a/src/cpu/amd/model_gx1/cpu_setup.inc
+++ b/src/cpu/amd/geode_gx1/cpu_setup.inc
diff --git a/src/cpu/amd/model_gx1/model_gx1_init.c b/src/cpu/amd/geode_gx1/geode_gx1_init.c
index e3c9034bee..60f9473470 100644
--- a/src/cpu/amd/model_gx1/model_gx1_init.c
+++ b/src/cpu/amd/geode_gx1/geode_gx1_init.c
@@ -73,7 +73,7 @@ unsigned long addr;
 }
 #endif
 
-static void model_gx1_init(device_t dev)
+static void geode_gx1_init(device_t dev)
 {
 #if 0
 	gx1_cpu_setup();
@@ -87,7 +87,7 @@ static void model_gx1_init(device_t dev)
 };
 
 static struct device_operations cpu_dev_ops = {
-	.init	= model_gx1_init,
+	.init	= geode_gx1_init,
 };
 
 static struct cpu_device_id cpu_table[] = {
diff --git a/src/cpu/amd/model_gx1/gx_setup.inc b/src/cpu/amd/geode_gx1/gx_setup.inc
index 6d0e289120..6d0e289120 100644
--- a/src/cpu/amd/model_gx1/gx_setup.inc
+++ b/src/cpu/amd/geode_gx1/gx_setup.inc
diff --git a/src/cpu/amd/model_gx2/Kconfig b/src/cpu/amd/geode_gx2/Kconfig
index 4515a71c37..0e25542582 100644
--- a/src/cpu/amd/model_gx2/Kconfig
+++ b/src/cpu/amd/geode_gx2/Kconfig
@@ -17,10 +17,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-config CPU_AMD_GX2
+config CPU_AMD_GEODE_GX2
 	bool
 
-if CPU_AMD_GX2
+if CPU_AMD_GEODE_GX2
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
@@ -55,5 +55,4 @@ config VSA_FILENAME
 	help
 	  The path and filename of the file to use as VSA.
 
-endif # CPU_AMD_GX2
-
+endif # CPU_AMD_GEODE_GX2
diff --git a/src/cpu/amd/model_gx2/Makefile.inc b/src/cpu/amd/geode_gx2/Makefile.inc
index 5e6d9ca366..b70537accf 100644
--- a/src/cpu/amd/model_gx2/Makefile.inc
+++ b/src/cpu/amd/geode_gx2/Makefile.inc
@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 
-driver-y += model_gx2_init.c
+driver-y += geode_gx2_init.c
 ramstage-y += cpubug.c
 
-cpu_incs += $(src)/cpu/amd/model_gx2/cache_as_ram.inc
+cpu_incs += $(src)/cpu/amd/geode_gx2/cache_as_ram.inc
diff --git a/src/cpu/amd/model_gx2/cache_as_ram.inc b/src/cpu/amd/geode_gx2/cache_as_ram.inc
index 0af2fdf488..0af2fdf488 100644
--- a/src/cpu/amd/model_gx2/cache_as_ram.inc
+++ b/src/cpu/amd/geode_gx2/cache_as_ram.inc
diff --git a/src/cpu/amd/model_gx2/cpubug.c b/src/cpu/amd/geode_gx2/cpubug.c
index 473766c8a4..473766c8a4 100644
--- a/src/cpu/amd/model_gx2/cpubug.c
+++ b/src/cpu/amd/geode_gx2/cpubug.c
diff --git a/src/cpu/amd/model_gx2/cpureginit.c b/src/cpu/amd/geode_gx2/cpureginit.c
index 0fc852d531..0fc852d531 100644
--- a/src/cpu/amd/model_gx2/cpureginit.c
+++ b/src/cpu/amd/geode_gx2/cpureginit.c
diff --git a/src/cpu/amd/model_gx2/model_gx2_init.c b/src/cpu/amd/geode_gx2/geode_gx2_init.c
index 241c0f979f..7e481b5390 100644
--- a/src/cpu/amd/model_gx2/model_gx2_init.c
+++ b/src/cpu/amd/geode_gx2/geode_gx2_init.c
@@ -16,9 +16,9 @@ static void vsm_end_post_smi(void)
 			  );
 }
 
-static void model_gx2_init(device_t dev)
+static void geode_gx2_init(device_t dev)
 {
-	printk(BIOS_DEBUG, "model_gx2_init\n");
+	printk(BIOS_DEBUG, "geode_gx2_init\n");
 
 	/* Turn on caching if we haven't already */
 	x86_enable_cache();
@@ -28,11 +28,11 @@ static void model_gx2_init(device_t dev)
 
 	vsm_end_post_smi();
 
-	printk(BIOS_DEBUG, "model_gx2_init DONE\n");
+	printk(BIOS_DEBUG, "geode_gx2_init DONE\n");
 };
 
 static struct device_operations cpu_dev_ops = {
-	.init	= model_gx2_init,
+	.init	= geode_gx2_init,
 };
 
 static struct cpu_device_id cpu_table[] = {
diff --git a/src/cpu/amd/model_gx2/syspreinit.c b/src/cpu/amd/geode_gx2/syspreinit.c
index 814034823c..814034823c 100644
--- a/src/cpu/amd/model_gx2/syspreinit.c
+++ b/src/cpu/amd/geode_gx2/syspreinit.c
diff --git a/src/cpu/amd/model_lx/Kconfig b/src/cpu/amd/geode_lx/Kconfig
index 742ef6911a..e5462c6edb 100644
--- a/src/cpu/amd/model_lx/Kconfig
+++ b/src/cpu/amd/geode_lx/Kconfig
@@ -1,7 +1,7 @@
-config CPU_AMD_LX
+config CPU_AMD_GEODE_LX
 	bool
 
-if CPU_AMD_LX
+if CPU_AMD_GEODE_LX
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
@@ -36,4 +36,4 @@ config VSA_FILENAME
 	help
 	  The path and filename of the file to use as VSA.
 
-endif # CPU_AMD_LX
+endif # CPU_AMD_GEODE_LX
diff --git a/src/cpu/amd/model_lx/Makefile.inc b/src/cpu/amd/geode_lx/Makefile.inc
index 3455d1e5d6..a5e12817eb 100644
--- a/src/cpu/amd/model_lx/Makefile.inc
+++ b/src/cpu/amd/geode_lx/Makefile.inc
@@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 
-driver-y += model_lx_init.c
+driver-y += geode_lx_init.c
 ramstage-y += cpubug.c
 
-cpu_incs += $(src)/cpu/amd/model_lx/cache_as_ram.inc
+cpu_incs += $(src)/cpu/amd/geode_lx/cache_as_ram.inc
diff --git a/src/cpu/amd/model_lx/cache_as_ram.inc b/src/cpu/amd/geode_lx/cache_as_ram.inc
index a1d775d6d6..a1d775d6d6 100644
--- a/src/cpu/amd/model_lx/cache_as_ram.inc
+++ b/src/cpu/amd/geode_lx/cache_as_ram.inc
diff --git a/src/cpu/amd/model_lx/cpubug.c b/src/cpu/amd/geode_lx/cpubug.c
index e3b6e511ee..e3b6e511ee 100644
--- a/src/cpu/amd/model_lx/cpubug.c
+++ b/src/cpu/amd/geode_lx/cpubug.c
diff --git a/src/cpu/amd/model_lx/cpureginit.c b/src/cpu/amd/geode_lx/cpureginit.c
index bad98b51bf..bad98b51bf 100644
--- a/src/cpu/amd/model_lx/cpureginit.c
+++ b/src/cpu/amd/geode_lx/cpureginit.c
diff --git a/src/cpu/amd/model_lx/model_lx_init.c b/src/cpu/amd/geode_lx/geode_lx_init.c
index 85e6bfbb27..bb9a73ecc0 100644
--- a/src/cpu/amd/model_lx/model_lx_init.c
+++ b/src/cpu/amd/geode_lx/geode_lx_init.c
@@ -38,9 +38,9 @@ static void vsm_end_post_smi(void)
 			  ".byte 0x0f, 0x38\n" "pop %ax\n");
 }
 
-static void model_lx_init(device_t dev)
+static void geode_lx_init(device_t dev)
 {
-	printk(BIOS_DEBUG, "model_lx_init\n");
+	printk(BIOS_DEBUG, "geode_lx_init\n");
 
 	/* Turn on caching if we haven't already */
 	x86_enable_cache();
@@ -56,11 +56,11 @@ static void model_lx_init(device_t dev)
 	outb(0x02, 0x92);
 	printk(BIOS_DEBUG, "A20 (0x92): %d\n", inb(0x92));
 
-	printk(BIOS_DEBUG, "CPU model_lx_init DONE\n");
+	printk(BIOS_DEBUG, "CPU geode_lx_init DONE\n");
 };
 
 static struct device_operations cpu_dev_ops = {
-	.init = model_lx_init,
+	.init = geode_lx_init,
 };
 
 static struct cpu_device_id cpu_table[] = {
diff --git a/src/cpu/amd/model_lx/msrinit.c b/src/cpu/amd/geode_lx/msrinit.c
index 11182501c1..11182501c1 100644
--- a/src/cpu/amd/model_lx/msrinit.c
+++ b/src/cpu/amd/geode_lx/msrinit.c
diff --git a/src/cpu/amd/model_lx/syspreinit.c b/src/cpu/amd/geode_lx/syspreinit.c
index 35c54fba5f..35c54fba5f 100644
--- a/src/cpu/amd/model_lx/syspreinit.c
+++ b/src/cpu/amd/geode_lx/syspreinit.c