Move memory type information out of some AMD sockets.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5800 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/cpu/amd/socket_AM2/Kconfig

@@ -10,9 +10,3 @@ config CPU_SOCKET_TYPE
 	default 0x11
 	depends on CPU_AMD_SOCKET_AM2
 
-# DDR2 and REG
-config DIMM_SUPPORT
-	hex
-	default 0x0004
-	depends on CPU_AMD_SOCKET_AM2
-

src/cpu/amd/socket_AM2r2/Kconfig

@@ -9,12 +9,6 @@ config CPU_SOCKET_TYPE
 	default 0x11
 	depends on CPU_AMD_SOCKET_AM2R2
 
-# DDR2 and REG
-config DIMM_SUPPORT
-	hex
-	default 0x0104
-	depends on CPU_AMD_SOCKET_AM2R2
-
 config EXT_RT_TBL_SUPPORT
 	bool
 	default n

src/cpu/amd/socket_AM3/Kconfig

@@ -9,12 +9,6 @@ config CPU_SOCKET_TYPE
 	default 0x11
 	depends on CPU_AMD_SOCKET_AM3
 
-# DDR3 and REG
-config DIMM_SUPPORT
-	hex
-	default 0x0005
-	depends on CPU_AMD_SOCKET_AM3
-
 config EXT_RT_TBL_SUPPORT
 	bool
 	default n

src/cpu/amd/socket_ASB2/Kconfig

@@ -9,12 +9,6 @@ config CPU_SOCKET_TYPE
 	default 0x13
 	depends on CPU_AMD_SOCKET_ASB2
 
-# DDR3 and REG
-config DIMM_SUPPORT
-	hex
-	default 0x0005
-	depends on CPU_AMD_SOCKET_ASB2
-
 config EXT_RT_TBL_SUPPORT
 	bool
 	default n

src/cpu/amd/socket_F/Kconfig

@@ -9,9 +9,3 @@ config CPU_SOCKET_TYPE
 	default 0x10
 	depends on CPU_AMD_SOCKET_F
 
-# DDR2 and REG
-config DIMM_SUPPORT
-	hex
-	default 0x0104
-	depends on CPU_AMD_SOCKET_F
-

src/cpu/amd/socket_F_1207/Kconfig

@@ -8,12 +8,6 @@ config CPU_SOCKET_TYPE
 	default 0x10
 	depends on CPU_AMD_SOCKET_F_1207
 
-# DDR2 and REG
-config DIMM_SUPPORT
-	hex
-	default 0x0104
-	depends on CPU_AMD_SOCKET_F_1207
-
 config EXT_RT_TBL_SUPPORT
 	bool
 	default n

src/mainboard/amd/mahogany/Kconfig

@@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
+	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_AMD_RS780

src/mainboard/amd/mahogany_fam10/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2R2
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700

src/mainboard/amd/pistachio/Kconfig

@@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
+	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_AMD_RS690

src/mainboard/amd/serengeti_cheetah/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_AMD_AMD8111

src/mainboard/amd/serengeti_cheetah_fam10/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SOUTHBRIDGE_AMD_AMD8132

src/mainboard/amd/tilapia_fam10/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM3
+	select DIMM_DDR3
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700

src/mainboard/asus/m2v-mx_se/Kconfig

@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
+	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_VIA_VT8237R

src/mainboard/gigabyte/ga_2761gxdk/Kconfig

@@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
+	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_SIS_SIS966

src/mainboard/gigabyte/m57sli/Kconfig

@@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
+	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/gigabyte/ma785gmt/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM3
+	select DIMM_DDR3
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700

src/mainboard/gigabyte/ma78gm/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2R2
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700

src/mainboard/hp/dl145_g3/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_BROADCOM_BCM21000

src/mainboard/jetway/pa78vm5/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2R2
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_RS780
 	select SOUTHBRIDGE_AMD_SB700

src/mainboard/msi/ms7260/Kconfig

@@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
+	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/msi/ms9185/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_BROADCOM_BCM5780

src/mainboard/msi/ms9282/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/msi/ms9652_fam10/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627EHG

src/mainboard/nvidia/l1_2pvv/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/supermicro/h8dme/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/supermicro/h8dmr/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/supermicro/h8dmr_fam10/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF

src/mainboard/supermicro/h8qme_fam10/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_AMD8132
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/tyan/s2912/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55

src/mainboard/tyan/s2912_fam10/Kconfig

@@ -4,6 +4,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
+	select DIMM_DDR2
+	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF

src/northbridge/amd/amdfam10/Kconfig

@@ -75,4 +75,52 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on NORTHBRIDGE_AMD_AMDFAM10
 
+config DIMM_FBDIMM
+	bool
+	default n
+	depends on NORTHBRIDGE_AMD_AMDFAM10
+
+config DIMM_DDR2
+	bool
+	default n
+	depends on NORTHBRIDGE_AMD_AMDFAM10
+
+config DIMM_DDR3
+	bool
+	default n
+	depends on NORTHBRIDGE_AMD_AMDFAM10
+
+config DIMM_REGISTERED
+	bool
+	default n
+	depends on NORTHBRIDGE_AMD_AMDFAM10
+
+if DIMM_FB_DIMM
+	config DIMM_SUPPORT
+		hex
+		default 0x0110
+endif
+
+if DIMM_DDR2
+	if DIMM_REGISTERED
+	config DIMM_SUPPORT
+		hex
+		default 0x0104
+	endif
+
+	if !DIMM_REGISTERED
+	config DIMM_SUPPORT
+		hex
+		default 0x0004
+	endif
+endif
+
+if DIMM_DDR3
+	if DIMM_REGISTERED
+	config DIMM_SUPPORT
+		hex
+		default 0x0005
+	endif
+endif
+
 source src/northbridge/amd/amdfam10/root_complex/Kconfig

src/northbridge/amd/amdk8/Kconfig

@@ -53,4 +53,28 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on NORTHBRIDGE_AMD_AMDK8
 
+config DIMM_DDR2
+	bool
+	default n
+	depends on NORTHBRIDGE_AMD_AMDFAM10
+
+config DIMM_REGISTERED
+	bool
+	default n
+	depends on NORTHBRIDGE_AMD_AMDFAM10
+
+if DIMM_DDR2
+	if DIMM_REGISTERED
+	config DIMM_SUPPORT
+		hex
+		default 0x0104
+	endif
+
+	if !DIMM_REGISTERED
+	config DIMM_SUPPORT
+		hex
+		default 0x0004
+	endif
+endif
+
 source src/northbridge/amd/amdk8/root_complex/Kconfig