Separate sockets from RAM for some sockets. Checked with abuild -C.
Signed-off-by: Myles Watson <[email protected]> Thanks, Myles
Index: svn/src/northbridge/amd/amdfam10/Kconfig =================================================================== --- svn.orig/src/northbridge/amd/amdfam10/Kconfig +++ svn/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 Index: svn/src/northbridge/amd/amdk8/Kconfig =================================================================== --- svn.orig/src/northbridge/amd/amdk8/Kconfig +++ svn/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 Index: svn/src/cpu/amd/socket_AM2/Kconfig =================================================================== --- svn.orig/src/cpu/amd/socket_AM2/Kconfig +++ svn/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 - Index: svn/src/cpu/amd/socket_AM2r2/Kconfig =================================================================== --- svn.orig/src/cpu/amd/socket_AM2r2/Kconfig +++ svn/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 Index: svn/src/cpu/amd/socket_AM3/Kconfig =================================================================== --- svn.orig/src/cpu/amd/socket_AM3/Kconfig +++ svn/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 Index: svn/src/cpu/amd/socket_ASB2/Kconfig =================================================================== --- svn.orig/src/cpu/amd/socket_ASB2/Kconfig +++ svn/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 Index: svn/src/cpu/amd/socket_F/Kconfig =================================================================== --- svn.orig/src/cpu/amd/socket_F/Kconfig +++ svn/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 - Index: svn/src/cpu/amd/socket_F_1207/Kconfig =================================================================== --- svn.orig/src/cpu/amd/socket_F_1207/Kconfig +++ svn/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 Index: svn/src/mainboard/amd/mahogany/Kconfig =================================================================== --- svn.orig/src/mainboard/amd/mahogany/Kconfig +++ svn/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 Index: svn/src/mainboard/amd/mahogany_fam10/Kconfig =================================================================== --- svn.orig/src/mainboard/amd/mahogany_fam10/Kconfig +++ svn/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 Index: svn/src/mainboard/amd/pistachio/Kconfig =================================================================== --- svn.orig/src/mainboard/amd/pistachio/Kconfig +++ svn/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 Index: svn/src/mainboard/amd/serengeti_cheetah/Kconfig =================================================================== --- svn.orig/src/mainboard/amd/serengeti_cheetah/Kconfig +++ svn/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 Index: svn/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig =================================================================== --- svn.orig/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ svn/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 Index: svn/src/mainboard/amd/tilapia_fam10/Kconfig =================================================================== --- svn.orig/src/mainboard/amd/tilapia_fam10/Kconfig +++ svn/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 Index: svn/src/mainboard/asus/m2v-mx_se/Kconfig =================================================================== --- svn.orig/src/mainboard/asus/m2v-mx_se/Kconfig +++ svn/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 Index: svn/src/mainboard/asus/m4a785-m/Kconfig =================================================================== --- svn.orig/src/mainboard/asus/m4a785-m/Kconfig +++ svn/src/mainboard/asus/m4a785-m/Kconfig @@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM3 + select DIMM_DDR2 select NORTHBRIDGE_AMD_AMDFAM10 select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 @@ -27,10 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select TINY_BOOTBLOCK select GFXUMA -config DIMM_SUPPORT - hex - default 0x0004 - config MAINBOARD_DIR string default asus/m4a785-m Index: svn/src/mainboard/gigabyte/ga_2761gxdk/Kconfig =================================================================== --- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/Kconfig +++ svn/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 Index: svn/src/mainboard/gigabyte/m57sli/Kconfig =================================================================== --- svn.orig/src/mainboard/gigabyte/m57sli/Kconfig +++ svn/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 Index: svn/src/mainboard/gigabyte/ma785gmt/Kconfig =================================================================== --- svn.orig/src/mainboard/gigabyte/ma785gmt/Kconfig +++ svn/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 Index: svn/src/mainboard/gigabyte/ma78gm/Kconfig =================================================================== --- svn.orig/src/mainboard/gigabyte/ma78gm/Kconfig +++ svn/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 Index: svn/src/mainboard/hp/dl145_g3/Kconfig =================================================================== --- svn.orig/src/mainboard/hp/dl145_g3/Kconfig +++ svn/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 Index: svn/src/mainboard/jetway/pa78vm5/Kconfig =================================================================== --- svn.orig/src/mainboard/jetway/pa78vm5/Kconfig +++ svn/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 Index: svn/src/mainboard/msi/ms7260/Kconfig =================================================================== --- svn.orig/src/mainboard/msi/ms7260/Kconfig +++ svn/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 Index: svn/src/mainboard/msi/ms9185/Kconfig =================================================================== --- svn.orig/src/mainboard/msi/ms9185/Kconfig +++ svn/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 Index: svn/src/mainboard/msi/ms9282/Kconfig =================================================================== --- svn.orig/src/mainboard/msi/ms9282/Kconfig +++ svn/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 Index: svn/src/mainboard/msi/ms9652_fam10/Kconfig =================================================================== --- svn.orig/src/mainboard/msi/ms9652_fam10/Kconfig +++ svn/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 Index: svn/src/mainboard/nvidia/l1_2pvv/Kconfig =================================================================== --- svn.orig/src/mainboard/nvidia/l1_2pvv/Kconfig +++ svn/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 Index: svn/src/mainboard/supermicro/h8dme/Kconfig =================================================================== --- svn.orig/src/mainboard/supermicro/h8dme/Kconfig +++ svn/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 Index: svn/src/mainboard/supermicro/h8dmr/Kconfig =================================================================== --- svn.orig/src/mainboard/supermicro/h8dmr/Kconfig +++ svn/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 Index: svn/src/mainboard/supermicro/h8dmr_fam10/Kconfig =================================================================== --- svn.orig/src/mainboard/supermicro/h8dmr_fam10/Kconfig +++ svn/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 Index: svn/src/mainboard/supermicro/h8qme_fam10/Kconfig =================================================================== --- svn.orig/src/mainboard/supermicro/h8qme_fam10/Kconfig +++ svn/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 Index: svn/src/mainboard/tyan/s2912/Kconfig =================================================================== --- svn.orig/src/mainboard/tyan/s2912/Kconfig +++ svn/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 Index: svn/src/mainboard/tyan/s2912_fam10/Kconfig =================================================================== --- svn.orig/src/mainboard/tyan/s2912_fam10/Kconfig +++ svn/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
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
