[coreboot-gerrit] New patch to review for coreboot: cpu/amd: Add socket FM2

[Damien Zammit (damien@zamaudio.com)]

Damien Zammit (damien at zamaudio.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13708

-gerrit

commit ce271db18ca0331b8cd15f4c2724519ed5f3caab
Author: Damien Zammit <damien at zamaudio.com>
Date:   Wed Feb 10 13:59:21 2016 +1100

    cpu/amd: Add socket FM2
    
    Change-Id: I397c908867fef7583063c8cad7b83ce53482529b
    Signed-off-by: Damien Zammit <damien at zamaudio.com>
---
 src/cpu/amd/Kconfig                       |  1 +
 src/cpu/amd/Makefile.inc                  |  1 +
 src/cpu/amd/family_10h-family_15h/Kconfig |  5 +++--
 src/cpu/amd/socket_FM2/Kconfig            | 29 +++++++++++++++++++++++++++++
 src/cpu/amd/socket_FM2/Makefile.inc       | 13 +++++++++++++
 5 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig
index 8abc984..23e4deb 100644
--- a/src/cpu/amd/Kconfig
+++ b/src/cpu/amd/Kconfig
@@ -5,6 +5,7 @@ source src/cpu/amd/socket_AM2/Kconfig
 source src/cpu/amd/socket_AM2r2/Kconfig
 source src/cpu/amd/socket_AM3/Kconfig
 source src/cpu/amd/socket_C32/Kconfig
+source src/cpu/amd/socket_FM2/Kconfig
 source src/cpu/amd/socket_G34/Kconfig
 source src/cpu/amd/socket_ASB2/Kconfig
 source src/cpu/amd/socket_F/Kconfig
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
index e532aba..da6862d 100644
--- a/src/cpu/amd/Makefile.inc
+++ b/src/cpu/amd/Makefile.inc
@@ -8,6 +8,7 @@ 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_NON_AGESA) += socket_C32
+subdirs-$(CONFIG_CPU_AMD_SOCKET_FM2_NON_AGESA) += socket_FM2
 subdirs-$(CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA) += socket_G34
 subdirs-$(CONFIG_CPU_AMD_GEODE_GX2) += geode_gx2
 subdirs-$(CONFIG_CPU_AMD_GEODE_LX) += geode_lx
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index bfb6751..8a97f3c 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -10,14 +10,15 @@ config CPU_AMD_MODEL_10XXX
 	select TSC_SYNC_LFENCE
 	select UDELAY_LAPIC
 	select HAVE_MONOTONIC_TIMER
-	select SUPPORT_CPU_UCODE_IN_CBFS
-	select CPU_MICROCODE_MULTIPLE_FILES
+	#select SUPPORT_CPU_UCODE_IN_CBFS
+	#select CPU_MICROCODE_MULTIPLE_FILES
 
 if CPU_AMD_MODEL_10XXX
 
 config USE_LARGE_DCACHE
 	bool
 	default y if CPU_AMD_SOCKET_G34_NON_AGESA
+	default y if CPU_AMD_SOCKET_FM2_NON_AGESA
 	default y if CPU_AMD_SOCKET_C32_NON_AGESA
 	default n
 
diff --git a/src/cpu/amd/socket_FM2/Kconfig b/src/cpu/amd/socket_FM2/Kconfig
new file mode 100644
index 0000000..a87694a
--- /dev/null
+++ b/src/cpu/amd/socket_FM2/Kconfig
@@ -0,0 +1,29 @@
+config CPU_AMD_SOCKET_FM2_NON_AGESA
+	bool
+	select CPU_AMD_MODEL_10XXX
+	select PCI_IO_CFG_EXT
+	select X86_AMD_FIXED_MTRRS
+
+if CPU_AMD_SOCKET_FM2_NON_AGESA
+
+config CPU_SOCKET_TYPE
+	hex
+	default 0x16
+
+config EXT_RT_TBL_SUPPORT
+	bool
+	default n
+
+config CBB
+	hex
+	default 0x0
+
+config CDB
+	hex
+	default 0x18
+
+config XIP_ROM_SIZE
+	hex
+	default 0x80000
+
+endif
diff --git a/src/cpu/amd/socket_FM2/Makefile.inc b/src/cpu/amd/socket_FM2/Makefile.inc
new file mode 100644
index 0000000..6917441
--- /dev/null
+++ b/src/cpu/amd/socket_FM2/Makefile.inc
@@ -0,0 +1,13 @@
+subdirs-y += ../family_10h-family_15h
+subdirs-y += ../quadcore
+subdirs-y += ../mtrr
+subdirs-y += ../microcode
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/pae
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/smm
+subdirs-y += ../smm
+
+cpu_incs-y += $(src)/cpu/amd/car/cache_as_ram.inc