Move memory type information out of some AMD sockets.
authorMyles Watson <mylesgw@gmail.com>
Fri, 10 Sep 2010 18:33:24 +0000 (18:33 +0000)
committerMyles Watson <mylesgw@gmail.com>
Fri, 10 Sep 2010 18:33:24 +0000 (18:33 +0000)
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

32 files changed:
src/cpu/amd/socket_AM2/Kconfig
src/cpu/amd/socket_AM2r2/Kconfig
src/cpu/amd/socket_AM3/Kconfig
src/cpu/amd/socket_ASB2/Kconfig
src/cpu/amd/socket_F/Kconfig
src/cpu/amd/socket_F_1207/Kconfig
src/mainboard/amd/mahogany/Kconfig
src/mainboard/amd/mahogany_fam10/Kconfig
src/mainboard/amd/pistachio/Kconfig
src/mainboard/amd/serengeti_cheetah/Kconfig
src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
src/mainboard/amd/tilapia_fam10/Kconfig
src/mainboard/asus/m2v-mx_se/Kconfig
src/mainboard/gigabyte/ga_2761gxdk/Kconfig
src/mainboard/gigabyte/m57sli/Kconfig
src/mainboard/gigabyte/ma785gmt/Kconfig
src/mainboard/gigabyte/ma78gm/Kconfig
src/mainboard/hp/dl145_g3/Kconfig
src/mainboard/jetway/pa78vm5/Kconfig
src/mainboard/msi/ms7260/Kconfig
src/mainboard/msi/ms9185/Kconfig
src/mainboard/msi/ms9282/Kconfig
src/mainboard/msi/ms9652_fam10/Kconfig
src/mainboard/nvidia/l1_2pvv/Kconfig
src/mainboard/supermicro/h8dme/Kconfig
src/mainboard/supermicro/h8dmr/Kconfig
src/mainboard/supermicro/h8dmr_fam10/Kconfig
src/mainboard/supermicro/h8qme_fam10/Kconfig
src/mainboard/tyan/s2912/Kconfig
src/mainboard/tyan/s2912_fam10/Kconfig
src/northbridge/amd/amdfam10/Kconfig
src/northbridge/amd/amdk8/Kconfig

index d4b8b226557db626645c8dfa9e798e9be69c4f4d..366306111caba0b1081f7723e7f97d5ac031c2d6 100644 (file)
@@ -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
-
index bdbfc64b8c698726c186fe6e2dc5480959d22e08..9435a558677069b768b05f4859f78ac1bc90d8ba 100644 (file)
@@ -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
index 6b8d12d3d45179fac68fd0eb5d1ed99fb8f7b19e..2979cbe3d5375bf46d51557f01d6acf71d972a8a 100644 (file)
@@ -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
index 3aa95c300f61243fe188e448e09f7f59ebedb780..7b8857f3a4af3670c7199f13223e1095e4b9acc9 100644 (file)
@@ -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
index 83ca2b9084481fa956072fe068bdc594152a502b..f32e69050cd0430408d521ba040025162ae64112 100644 (file)
@@ -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
-
index 643827ca5212078db63ffc7ceae5f55610b0786f..959fea5449629ab9a4b5fd458b01d9cfd7849eb0 100644 (file)
@@ -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
index e20d9a8f7a48e294254634bd3334f93c77dc6934..c69d5b4403f445c0eeb7ca215a2b7addeb1639ea 100644 (file)
@@ -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
index 762a1aca2974a5d9823adb2753a5307c0942eaa6..961ef1532cb5688ca6aba8857bc5e9b2ad550f17 100644 (file)
@@ -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
index f0f8b25e80bc3dabb34ec8fee2cc38436214081c..94c714c8f7f54eaccfe1c410f25e4b95223b1252 100644 (file)
@@ -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
index f2a0901ec9692a04cbd171ec89062a120ac4ae33..2e7308c60229443bba9c946681b58fc165aeb906 100644 (file)
@@ -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
index 5149df31e7a9db63ff5f0955ebd225abc0299f61..7191d70e48abbf6dc5964ec842b6284b9853375a 100644 (file)
@@ -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
index e44d012cdff3cdd28b48a2d874ee7fc9885368f3..c09b8aa1ddbb0af689a82c795e4d561756be51f7 100644 (file)
@@ -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
index 41499613c63af9e4cea0369ec3176532ca314913..ac967bd3b1079e0dda697e71b2e7d583266da8e6 100644 (file)
@@ -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
index 1b17b6594c9cd2a2dd8a9d2fe041f6f7ca1d092d..64245707aa422a936081119f12c728a07b4ff5be 100644 (file)
@@ -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
index e0e582e25351fc0da135ae88c1ae6d0367f74de0..ed860bafd0e5f5e561f469654fe6aded89804ae5 100644 (file)
@@ -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
index 99cf850124455475101fd051e17455a2124a0b77..685be90208555d715f32c36fe85edf9ffd1ac151 100644 (file)
@@ -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
index 6ad715c45183c2ca9697bb6f1cab55ed7672b803..1290a09ad1d06749ae2526000f44e1b744563764 100644 (file)
@@ -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
index 065ddac76eae25ffc82cdefd99d9ca423e7a6538..1bae1d89469a4c574a9f722835e83d1064ed4eeb 100644 (file)
@@ -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
index 63e48ebe25539bf86ce6f03a58b680b2d99188c3..6f5ed79810b70b083d107311512c83ede5410003 100644 (file)
@@ -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
index 9c979aa8128fbb7a2733f7e484ca48d1e02c2786..06de20c916986c55e2f97d04af19e440c118c90f 100644 (file)
@@ -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
index 4a6410115bb99e23eeec9b9f7a397f1b20aa8958..38aa6ed16fb3c364e170fe0523a23483193598a0 100644 (file)
@@ -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
index 40a07182c211cea57bd0e7d5ab5e4ae9408cac77..bce75d6d25fc1d07cd0161a0116e0d161e5c5e00 100644 (file)
@@ -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
index 829b70b007b21f06ad43db294a20ddb1665dbdda..ea9ccc0686b35e536915d905caaa0b537bdb0081 100644 (file)
@@ -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
index d948c228aec521db182f87f522231c435447d526..502da61dac3d202cb0da777953a6250e250aaf55 100644 (file)
@@ -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
index 88b27a7c203aff96801ad85a4213f7e3fe58a4fc..9e69f9f26612cba871ffe331b86a641f2df6d1c0 100644 (file)
@@ -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
index 20d9e3ccc739ea2a1655ccd7f0aa0d2c58e6c7a0..35282d869041fe43c1f0724a938c024f94812dcd 100644 (file)
@@ -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
index c47fe4898c70e1c1c577757b27f54a678e490293..a5b32ccc0961a3abd5a1da4465ba20220b8c89f6 100644 (file)
@@ -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
index 3bac4ff3eef4e742f1a785a74d0e0b54fc78c65c..b71697391267b9f11251e86d058b0d78f3504866 100644 (file)
@@ -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
index 30dd3bb6feec941902ec6ed5fadf18dec61bbf6b..2075b317e3474db4b8cbd58a5a5e70f1ea5ac968 100644 (file)
@@ -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
index e00408b0fff6dd7b26ea75a4508c55cd61fd2c78..5f3a687fd0f6dd67da2b400f363ba723ff26fad4 100644 (file)
@@ -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
index 5ba0fa95150b604b35089de396bc4633c974ef89..e73eca81d45cfffb4149a66c10c471b4e62abed3 100644 (file)
@@ -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
index 014e1ee03d91b5458112941767a6633f097f97b9..02a23ab36ea5364fa5c1afeca111ec9346e2c0f9 100644 (file)
@@ -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