From 9f8ecf5eb9364683fbaea881772d2550ae6339e5 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 25 Aug 2009 14:22:58 +0000 Subject: [PATCH] Add support for AMD Socket 940. Move common files to model_fxx. Signed-off-by: Myles Watson Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4574 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/Kconfig | 2 +- src/cpu/amd/Makefile.inc | 1 + src/cpu/amd/model_fxx/Makefile.inc | 13 +++++++++++++ src/cpu/amd/socket_940/Kconfig | 14 ++++++++++++++ src/cpu/amd/socket_940/Makefile.inc | 2 ++ src/cpu/amd/socket_AM2/Kconfig | 4 ++-- src/cpu/amd/socket_AM2/Makefile.inc | 13 ------------- src/cpu/amd/socket_F/Kconfig | 4 ++-- src/cpu/amd/socket_F/Makefile.inc | 12 ------------ 9 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 src/cpu/amd/socket_940/Kconfig create mode 100644 src/cpu/amd/socket_940/Makefile.inc diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig index 2cd1761ac..f1f6f511a 100644 --- a/src/cpu/amd/Kconfig +++ b/src/cpu/amd/Kconfig @@ -1,6 +1,6 @@ #source src/cpu/amd/socket_754/Kconfig #source src/cpu/amd/socket_939/Kconfig -#source src/cpu/amd/socket_940/Kconfig +source src/cpu/amd/socket_940/Kconfig source src/cpu/amd/socket_AM2/Kconfig #source src/cpu/amd/socket_AM2r2/Kconfig source src/cpu/amd/socket_F/Kconfig diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc index 578de4f73..18a52f406 100644 --- a/src/cpu/amd/Makefile.inc +++ b/src/cpu/amd/Makefile.inc @@ -1,2 +1,3 @@ subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += socket_F +subdirs-$(CONFIG_CPU_AMD_SOCKET_940) += socket_940 subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2) += socket_AM2 diff --git a/src/cpu/amd/model_fxx/Makefile.inc b/src/cpu/amd/model_fxx/Makefile.inc index ea3088b46..c184df967 100644 --- a/src/cpu/amd/model_fxx/Makefile.inc +++ b/src/cpu/amd/model_fxx/Makefile.inc @@ -4,3 +4,16 @@ obj-y += apic_timer.o obj-y += model_fxx_update_microcode.o obj-y += processor_name.o obj-y += powernow_acpi.o +subdirs-y += ../dualcore +subdirs-y += ../mtrr +subdirs-y += ../microcode +subdirs-y += ../../x86/tsc +subdirs-y += ../../x86/mtrr +subdirs-y += ../../x86/fpu +subdirs-y += ../../x86/mmx +subdirs-y += ../../x86/sse +subdirs-y += ../../x86/lapic +subdirs-y += ../../x86/cache +subdirs-y += ../../x86/mtrr +subdirs-y += ../../x86/pae +subdirs-y += ../../x86/smm diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig new file mode 100644 index 000000000..d00f38828 --- /dev/null +++ b/src/cpu/amd/socket_940/Kconfig @@ -0,0 +1,14 @@ +config CPU_AMD_SOCKET_940 + bool + default false + +config K8_REV_F_SUPPORT + bool + default n + depends on CPU_AMD_SOCKET_940 + +#Opteron K8 1G HT Support +config K8_HT_FREQ_1G_SUPPORT + hex + default 1 + depends on CPU_AMD_SOCKET_940 diff --git a/src/cpu/amd/socket_940/Makefile.inc b/src/cpu/amd/socket_940/Makefile.inc new file mode 100644 index 000000000..cd7caf3ad --- /dev/null +++ b/src/cpu/amd/socket_940/Makefile.inc @@ -0,0 +1,2 @@ +obj-y += socket_940.o +subdirs-y += ../model_fxx diff --git a/src/cpu/amd/socket_AM2/Kconfig b/src/cpu/amd/socket_AM2/Kconfig index 6b61131fa..257bbc809 100644 --- a/src/cpu/amd/socket_AM2/Kconfig +++ b/src/cpu/amd/socket_AM2/Kconfig @@ -8,8 +8,8 @@ config CPU_SOCKET_TYPE depends on CPU_AMD_SOCKET_AM2 config K8_REV_F_SUPPORT - hex - default 1 + bool + default y depends on CPU_AMD_SOCKET_AM2 # Opteron K8 1G HT support diff --git a/src/cpu/amd/socket_AM2/Makefile.inc b/src/cpu/amd/socket_AM2/Makefile.inc index b5d8059fd..358923eb1 100644 --- a/src/cpu/amd/socket_AM2/Makefile.inc +++ b/src/cpu/amd/socket_AM2/Makefile.inc @@ -1,15 +1,2 @@ obj-y += socket_AM2.o subdirs-y += ../model_fxx -subdirs-y += ../dualcore -subdirs-y += ../mtrr -subdirs-y += ../microcode -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/fpu -subdirs-y += ../../x86/mmx -subdirs-y += ../../x86/sse -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/pae -subdirs-y += ../../x86/smm diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig index f9e03359e..dd38a661c 100644 --- a/src/cpu/amd/socket_F/Kconfig +++ b/src/cpu/amd/socket_F/Kconfig @@ -8,8 +8,8 @@ config CPU_SOCKET_TYPE depends on CPU_AMD_SOCKET_F config K8_REV_F_SUPPORT - hex - default 1 + bool + default y depends on CPU_AMD_SOCKET_F # Opteron K8 1G HT support diff --git a/src/cpu/amd/socket_F/Makefile.inc b/src/cpu/amd/socket_F/Makefile.inc index a3be24c15..0c05fd5b2 100644 --- a/src/cpu/amd/socket_F/Makefile.inc +++ b/src/cpu/amd/socket_F/Makefile.inc @@ -1,14 +1,2 @@ obj-y += socket_F.o subdirs-y += ../model_fxx -subdirs-y += ../dualcore -subdirs-y += ../mtrr -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/fpu -subdirs-y += ../../x86/mmx -subdirs-y += ../../x86/sse -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/pae -subdirs-y += ../../x86/smm -- 2.25.1