19 files changed, 7 insertions, 7 deletions
diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig
index 3a02043848..8abc98432e 100644
--- a/src/cpu/amd/Kconfig
+++ b/src/cpu/amd/Kconfig
@@ -12,7 +12,7 @@ source src/cpu/amd/socket_F_1207/Kconfig
 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/family_10h-family_15h/Kconfig
 source src/cpu/amd/geode_gx2/Kconfig
 source src/cpu/amd/geode_lx/Kconfig
 
diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index 7c47e27ca2..7c47e27ca2 100644
--- a/src/cpu/amd/model_10xxx/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
diff --git a/src/cpu/amd/model_10xxx/Makefile.inc b/src/cpu/amd/family_10h-family_15h/Makefile.inc
index 5a81ab8b11..5a81ab8b11 100644
--- a/src/cpu/amd/model_10xxx/Makefile.inc
+++ b/src/cpu/amd/family_10h-family_15h/Makefile.inc
diff --git a/src/cpu/amd/model_10xxx/defaults.h b/src/cpu/amd/family_10h-family_15h/defaults.h
index c4cf182764..c4cf182764 100644
--- a/src/cpu/amd/model_10xxx/defaults.h
+++ b/src/cpu/amd/family_10h-family_15h/defaults.h
diff --git a/src/cpu/amd/model_10xxx/fidvid.c b/src/cpu/amd/family_10h-family_15h/fidvid.c
index ce632765b4..ce632765b4 100644
--- a/src/cpu/amd/model_10xxx/fidvid.c
+++ b/src/cpu/amd/family_10h-family_15h/fidvid.c
diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c
index d618c0c277..d618c0c277 100644
--- a/src/cpu/amd/model_10xxx/init_cpus.c
+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c
diff --git a/src/cpu/amd/model_10xxx/model_10xxx_init.c b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c
index 8d6610ceef..8d6610ceef 100644
--- a/src/cpu/amd/model_10xxx/model_10xxx_init.c
+++ b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c
diff --git a/src/cpu/amd/model_10xxx/monotonic_timer.c b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c
index 53b4c30145..53b4c30145 100644
--- a/src/cpu/amd/model_10xxx/monotonic_timer.c
+++ b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c
diff --git a/src/cpu/amd/model_10xxx/powernow_acpi.c b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
index 295a0bfe96..295a0bfe96 100644
--- a/src/cpu/amd/model_10xxx/powernow_acpi.c
+++ b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
diff --git a/src/cpu/amd/model_10xxx/processor_name.c b/src/cpu/amd/family_10h-family_15h/processor_name.c
index 9fe896e136..9fe896e136 100644
--- a/src/cpu/amd/model_10xxx/processor_name.c
+++ b/src/cpu/amd/family_10h-family_15h/processor_name.c
diff --git a/src/cpu/amd/model_10xxx/ram_calc.c b/src/cpu/amd/family_10h-family_15h/ram_calc.c
index 9ac2c993f8..9ac2c993f8 100644
--- a/src/cpu/amd/model_10xxx/ram_calc.c
+++ b/src/cpu/amd/family_10h-family_15h/ram_calc.c
diff --git a/src/cpu/amd/model_10xxx/ram_calc.h b/src/cpu/amd/family_10h-family_15h/ram_calc.h
index 8cfc199bdf..8cfc199bdf 100644
--- a/src/cpu/amd/model_10xxx/ram_calc.h
+++ b/src/cpu/amd/family_10h-family_15h/ram_calc.h
diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/family_10h-family_15h/update_microcode.c
index c295de679d..c295de679d 100644
--- a/src/cpu/amd/model_10xxx/update_microcode.c
+++ b/src/cpu/amd/family_10h-family_15h/update_microcode.c
diff --git a/src/cpu/amd/socket_AM2r2/Makefile.inc b/src/cpu/amd/socket_AM2r2/Makefile.inc
index 3675af4b32..6917441967 100644
--- a/src/cpu/amd/socket_AM2r2/Makefile.inc
+++ b/src/cpu/amd/socket_AM2r2/Makefile.inc
@@ -1,4 +1,4 @@
-subdirs-y += ../model_10xxx
+subdirs-y += ../family_10h-family_15h
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr
 subdirs-y += ../microcode
diff --git a/src/cpu/amd/socket_AM3/Makefile.inc b/src/cpu/amd/socket_AM3/Makefile.inc
index 3675af4b32..6917441967 100644
--- a/src/cpu/amd/socket_AM3/Makefile.inc
+++ b/src/cpu/amd/socket_AM3/Makefile.inc
@@ -1,4 +1,4 @@
-subdirs-y += ../model_10xxx
+subdirs-y += ../family_10h-family_15h
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr
 subdirs-y += ../microcode
diff --git a/src/cpu/amd/socket_ASB2/Makefile.inc b/src/cpu/amd/socket_ASB2/Makefile.inc
index 3675af4b32..6917441967 100644
--- a/src/cpu/amd/socket_ASB2/Makefile.inc
+++ b/src/cpu/amd/socket_ASB2/Makefile.inc
@@ -1,4 +1,4 @@
-subdirs-y += ../model_10xxx
+subdirs-y += ../family_10h-family_15h
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr
 subdirs-y += ../microcode
diff --git a/src/cpu/amd/socket_C32/Makefile.inc b/src/cpu/amd/socket_C32/Makefile.inc
index 3675af4b32..6917441967 100644
--- a/src/cpu/amd/socket_C32/Makefile.inc
+++ b/src/cpu/amd/socket_C32/Makefile.inc
@@ -1,4 +1,4 @@
-subdirs-y += ../model_10xxx
+subdirs-y += ../family_10h-family_15h
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr
 subdirs-y += ../microcode
diff --git a/src/cpu/amd/socket_F_1207/Makefile.inc b/src/cpu/amd/socket_F_1207/Makefile.inc
index b74862e3e5..ece8d9ae98 100644
--- a/src/cpu/amd/socket_F_1207/Makefile.inc
+++ b/src/cpu/amd/socket_F_1207/Makefile.inc
@@ -1,4 +1,4 @@
-subdirs-y += ../model_10xxx
+subdirs-y += ../family_10h-family_15h
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr
 subdirs-y += ../microcode
diff --git a/src/cpu/amd/socket_G34/Makefile.inc b/src/cpu/amd/socket_G34/Makefile.inc
index a8e1333d9b..de33cd32d4 100644
--- a/src/cpu/amd/socket_G34/Makefile.inc
+++ b/src/cpu/amd/socket_G34/Makefile.inc
@@ -1,5 +1,5 @@
 ramstage-y += socket_G34.c
-subdirs-y += ../model_10xxx
+subdirs-y += ../family_10h-family_15h
 subdirs-y += ../quadcore
 subdirs-y += ../mtrr
 subdirs-y += ../microcode