9 files changed, 22 insertions, 17 deletions
diff --git a/src/cpu/via/Kconfig b/src/cpu/via/Kconfig
index 006fb8b456..570d4084a1 100644
--- a/src/cpu/via/Kconfig
+++ b/src/cpu/via/Kconfig
@@ -1,2 +1,2 @@
-source src/cpu/via/model_c3/Kconfig
-source src/cpu/via/model_c7/Kconfig
+source src/cpu/via/c3/Kconfig
+source src/cpu/via/c7/Kconfig
diff --git a/src/cpu/via/Makefile.inc b/src/cpu/via/Makefile.inc
index 512f82b02e..2616111aaa 100644
--- a/src/cpu/via/Makefile.inc
+++ b/src/cpu/via/Makefile.inc
@@ -1,3 +1,3 @@
-subdirs-$(CONFIG_CPU_VIA_C7) += model_c7
-subdirs-$(CONFIG_CPU_VIA_C3) += model_c3
+subdirs-$(CONFIG_CPU_VIA_C7) += c7
+subdirs-$(CONFIG_CPU_VIA_C3) += c3
 
diff --git a/src/cpu/via/c3/Kconfig b/src/cpu/via/c3/Kconfig
new file mode 100644
index 0000000000..a5b4f22673
--- /dev/null
+++ b/src/cpu/via/c3/Kconfig
@@ -0,0 +1,11 @@
+config CPU_VIA_C3
+	bool
+
+if CPU_VIA_C3
+
+config CPU_SPECIFIC_OPTIONS
+	def_bool y
+	select UDELAY_TSC
+	select MMX
+
+endif # CPU_VIA_C3
diff --git a/src/cpu/via/model_c3/Makefile.inc b/src/cpu/via/c3/Makefile.inc
index 320b649a2f..e6b889aece 100644
--- a/src/cpu/via/model_c3/Makefile.inc
+++ b/src/cpu/via/c3/Makefile.inc
@@ -5,4 +5,4 @@ subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 subdirs-y += ../../intel/microcode
 
-driver-y += model_c3_init.c
+driver-y += c3_init.c
diff --git a/src/cpu/via/model_c3/model_c3_init.c b/src/cpu/via/c3/c3_init.c
index 0c5315bb53..7d9438479c 100644
--- a/src/cpu/via/model_c3/model_c3_init.c
+++ b/src/cpu/via/c3/c3_init.c
@@ -26,7 +26,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/cache.h>
 
-static void model_c3_init(device_t dev)
+static void c3_init(device_t dev)
 {
 	x86_enable_cache();
 	x86_setup_mtrrs();
@@ -37,7 +37,7 @@ static void model_c3_init(device_t dev)
 };
 
 static struct device_operations cpu_dev_ops = {
-	.init     = model_c3_init,
+	.init     = c3_init,
 };
 
 static struct cpu_device_id cpu_table[] = {
diff --git a/src/cpu/via/model_c7/Kconfig b/src/cpu/via/c7/Kconfig
index 8e6f0e8765..ebbb8f9f02 100644
--- a/src/cpu/via/model_c7/Kconfig
+++ b/src/cpu/via/c7/Kconfig
@@ -3,7 +3,7 @@ config CPU_VIA_C7
 
 if CPU_VIA_C7
 
-config CPU_SPECFIC_OPTIONS
+config CPU_SPECIFIC_OPTIONS
 	def_bool y
 	select UDELAY_TSC
 	select MMX
@@ -13,11 +13,9 @@ config CPU_SPECFIC_OPTIONS
 config DCACHE_RAM_BASE
 	hex
 	default 0xffef0000
-	depends on CPU_VIA_C7
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x8000
-	depends on CPU_VIA_C7
 
 endif # CPU_VIA_C7
diff --git a/src/cpu/via/model_c7/Makefile.inc b/src/cpu/via/c7/Makefile.inc
index c6ab45e7b8..5300f5d224 100644
--- a/src/cpu/via/model_c7/Makefile.inc
+++ b/src/cpu/via/c7/Makefile.inc
@@ -5,6 +5,6 @@ subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 subdirs-y += ../../intel/microcode
 
-driver-y += model_c7_init.c
+driver-y += c7_init.c
 
 cpu_incs += $(src)/cpu/via/car/cache_as_ram.inc
diff --git a/src/cpu/via/model_c7/model_c7_init.c b/src/cpu/via/c7/c7_init.c
index 585f7494b8..510e66d8ba 100644
--- a/src/cpu/via/model_c7/model_c7_init.c
+++ b/src/cpu/via/c7/c7_init.c
@@ -147,7 +147,7 @@ static void set_c7_speed(int model) {
 	printk(BIOS_INFO, "Current CPU multiplier: %dx\n", (int)((msr.lo >> 8) & 0xff));
 }
 
-static void model_c7_init(device_t dev)
+static void c7_init(device_t dev)
 {
 	u8 brand;
 	struct cpuinfo_x86 c;
@@ -210,7 +210,7 @@ static void model_c7_init(device_t dev)
 };
 
 static struct device_operations cpu_dev_ops = {
-	.init = model_c7_init,
+	.init = c7_init,
 };
 
 /* Look in arch/x86/lib/cpu.c:cpu_initialize. If there is no CPU with an exact
diff --git a/src/cpu/via/model_c3/Kconfig b/src/cpu/via/model_c3/Kconfig
deleted file mode 100644
index d613909ee7..0000000000
--- a/src/cpu/via/model_c3/Kconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-config CPU_VIA_C3
-	bool
-	select UDELAY_TSC
-	select MMX