[commit] r6036 - in trunk/src: mainboard/amd/serengeti_cheetah mainboard/gigabyte/ga_2761gxdk mainboard/gigabyte/m57sli mainboard/hp/dl145_g3 mainboard/iwill/dk8_htx mainboard/iwill/dk8s2 mainboard...
Author: oxygene Date: Sun Nov 7 19:20:51 2010 New Revision: 6036 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6036
Log: Move K8_ALLOCATE_IO_RANGE to Kconfig.
Signed-off-by: Patrick Georgi patrick@georgi-clan.de Acked-by: Patrick Georgi patrick@georgi-clan.de
Modified: trunk/src/mainboard/amd/serengeti_cheetah/romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/gigabyte/m57sli/Kconfig trunk/src/mainboard/gigabyte/m57sli/romstage.c trunk/src/mainboard/hp/dl145_g3/Kconfig trunk/src/mainboard/hp/dl145_g3/romstage.c trunk/src/mainboard/iwill/dk8_htx/romstage.c trunk/src/mainboard/iwill/dk8s2/romstage.c trunk/src/mainboard/iwill/dk8x/romstage.c trunk/src/mainboard/msi/ms7260/Kconfig trunk/src/mainboard/msi/ms7260/romstage.c trunk/src/mainboard/msi/ms9185/romstage.c trunk/src/mainboard/nvidia/l1_2pvv/Kconfig trunk/src/mainboard/nvidia/l1_2pvv/romstage.c trunk/src/mainboard/sunw/ultra40/Kconfig trunk/src/mainboard/sunw/ultra40/romstage.c trunk/src/mainboard/supermicro/h8dme/Kconfig trunk/src/mainboard/supermicro/h8dme/romstage.c trunk/src/mainboard/supermicro/h8dmr/Kconfig trunk/src/mainboard/supermicro/h8dmr/romstage.c trunk/src/mainboard/tyan/s2895/Kconfig trunk/src/mainboard/tyan/s2895/romstage.c trunk/src/mainboard/tyan/s2912/Kconfig trunk/src/mainboard/tyan/s2912/romstage.c trunk/src/northbridge/amd/amdk8/Kconfig trunk/src/northbridge/amd/amdk8/incoherent_ht.c
Modified: trunk/src/mainboard/amd/serengeti_cheetah/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -1,8 +1,5 @@ #define SET_NB_CFG_54 1
-//used by incoherent_ht -//#define K8_ALLOCATE_IO_RANGE 1 - //used by init_cpus and fidvid #define SET_FIDVID 0 //if we want to wait for core1 done before DQS training, set it to 0
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -20,6 +20,7 @@ select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/gigabyte/m57sli/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/gigabyte/m57sli/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -24,6 +24,7 @@ select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/gigabyte/m57sli/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/hp/dl145_g3/Kconfig ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/hp/dl145_g3/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -22,6 +22,7 @@ select RAMINIT_SYSINFO select SB_HT_CHAIN_UNITID_OFFSET_ONLY select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/hp/dl145_g3/romstage.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/hp/dl145_g3/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -25,9 +25,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/iwill/dk8_htx/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/iwill/dk8_htx/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -1,8 +1,5 @@ #define SET_NB_CFG_54 1
-//used by incoherent_ht -//#define K8_ALLOCATE_IO_RANGE 1 - //used by init_cpus and fidvid #define SET_FIDVID 0 //if we want to wait for core1 done before DQS training, set it to 0
Modified: trunk/src/mainboard/iwill/dk8s2/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/iwill/dk8s2/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -1,8 +1,5 @@ #define SET_NB_CFG_54 1
-//used by incoherent_ht -//#define K8_ALLOCATE_IO_RANGE 1 - //used by init_cpus and fidvid #define SET_FIDVID 0 //if we want to wait for core1 done before DQS training, set it to 0
Modified: trunk/src/mainboard/iwill/dk8x/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8x/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/iwill/dk8x/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -1,8 +1,5 @@ #define SET_NB_CFG_54 1
-//used by incoherent_ht -//#define K8_ALLOCATE_IO_RANGE 1 - //used by init_cpus and fidvid #define SET_FIDVID 0 //if we want to wait for core1 done before DQS training, set it to 0
Modified: trunk/src/mainboard/msi/ms7260/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms7260/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/msi/ms7260/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -22,6 +22,7 @@ select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/msi/ms7260/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/msi/ms7260/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -24,7 +24,6 @@ // #define DQS_TRAIN_DEBUG 1 // #define RES_DEBUG 1
-#define K8_ALLOCATE_IO_RANGE 1 #if CONFIG_LOGICAL_CPUS == 1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/msi/ms9185/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/msi/ms9185/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -25,9 +25,6 @@
#define SET_NB_CFG_54 1
-//used by incoherent_ht -//#define K8_ALLOCATE_IO_RANGE 1 - //used by init_cpus and fidvid #define SET_FIDVID 1 //if we want to wait for core1 done before DQS training, set it to 0
Modified: trunk/src/mainboard/nvidia/l1_2pvv/Kconfig ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -23,6 +23,7 @@ select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/sunw/ultra40/Kconfig ============================================================================== --- trunk/src/mainboard/sunw/ultra40/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/sunw/ultra40/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -17,6 +17,7 @@ select CK804_USE_NIC select CK804_USE_ACI select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/sunw/ultra40/romstage.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/sunw/ultra40/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -1,6 +1,3 @@ -#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/supermicro/h8dme/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/supermicro/h8dme/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -23,6 +23,7 @@ select BOARD_ROMSIZE_KB_1024 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/supermicro/h8dme/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/supermicro/h8dme/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/supermicro/h8dmr/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/supermicro/h8dmr/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -22,6 +22,7 @@ select BOARD_ROMSIZE_KB_1024 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/supermicro/h8dmr/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/supermicro/h8dmr/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/tyan/s2895/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2895/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/tyan/s2895/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -18,6 +18,7 @@ select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_1024 select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/tyan/s2895/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/tyan/s2895/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -1,6 +1,3 @@ -#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/mainboard/tyan/s2912/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2912/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/tyan/s2912/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -22,6 +22,7 @@ select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO select QRANK_DIMM_SUPPORT + select K8_ALLOCATE_IO_RANGE
config MAINBOARD_DIR string
Modified: trunk/src/mainboard/tyan/s2912/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/romstage.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/mainboard/tyan/s2912/romstage.c Sun Nov 7 19:20:51 2010 (r6036) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#define K8_ALLOCATE_IO_RANGE 1 - - #if CONFIG_LOGICAL_CPUS==1 #define SET_NB_CFG_54 1 #endif
Modified: trunk/src/northbridge/amd/amdk8/Kconfig ============================================================================== --- trunk/src/northbridge/amd/amdk8/Kconfig Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/northbridge/amd/amdk8/Kconfig Sun Nov 7 19:20:51 2010 (r6036) @@ -53,6 +53,10 @@ bool default n
+config K8_ALLOCATE_IO_RANGE + bool + default n + if K8_REV_F_SUPPORT
config DIMM_DDR2
Modified: trunk/src/northbridge/amd/amdk8/incoherent_ht.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/incoherent_ht.c Sun Nov 7 19:20:32 2010 (r6035) +++ trunk/src/northbridge/amd/amdk8/incoherent_ht.c Sun Nov 7 19:20:51 2010 (r6036) @@ -11,10 +11,6 @@ #define CONFIG_K8_HT_FREQ_1G_SUPPORT 0 #endif
-#ifndef K8_ALLOCATE_IO_RANGE - #define K8_ALLOCATE_IO_RANGE 0 -#endif - // Do we need allocate MMIO? Current We direct last 64M to sblink only, We can not lose access to last 4M range to ROM #ifndef K8_ALLOCATE_MMIO_RANGE #define K8_ALLOCATE_MMIO_RANGE 0 @@ -720,7 +716,7 @@ uint8_t next_busn; uint8_t ht_c_num; uint8_t nodes; -#if K8_ALLOCATE_IO_RANGE == 1 +#if CONFIG_K8_ALLOCATE_IO_RANGE unsigned next_io_base; #endif
@@ -740,7 +736,7 @@
next_busn=0x3f+1; /* 0 will be used ht chain with SB we need to keep SB in bus0 in auto stage*/
-#if K8_ALLOCATE_IO_RANGE == 1 +#if CONFIG_K8_ALLOCATE_IO_RANGE /* io range allocation */ tempreg = 0 | (((reg>>8) & 0x3) << 4 )| (0x3<<12); //limit pci_write_config32(PCI_DEV(0, 0x18, 1), 0xC4, tempreg); @@ -753,7 +749,7 @@ for(ht_c_num=1;ht_c_num<4; ht_c_num++) { pci_write_config32(PCI_DEV(0, 0x18, 1), 0xe0 + ht_c_num * 4, 0);
-#if K8_ALLOCATE_IO_RANGE == 1 +#if CONFIG_K8_ALLOCATE_IO_RANGE /* io range allocation */ pci_write_config32(PCI_DEV(0, 0x18, 1), 0xc4 + ht_c_num * 8, 0); pci_write_config32(PCI_DEV(0, 0x18, 1), 0xc0 + ht_c_num * 8, 0); @@ -786,7 +782,7 @@ pci_write_config32(PCI_DEV(0, 0x18, 1), 0xe0 + ht_c_num * 4, tempreg); next_busn+=0x3f+1;
-#if K8_ALLOCATE_IO_RANGE == 1 +#if CONFIG_K8_ALLOCATE_IO_RANGE /* io range allocation */ tempreg = nodeid | (linkn<<4) | ((next_io_base+0x3)<<12); //limit pci_write_config32(PCI_DEV(0, 0x18, 1), 0xC4 + ht_c_num * 8, tempreg); @@ -810,7 +806,7 @@ pci_write_config32(dev, regpos, reg); }
-#if K8_ALLOCATE_IO_RANGE == 1 +#if CONFIG_K8_ALLOCATE_IO_RANGE /* io range allocation */ for(i = 0; i< 4; i++) { unsigned regpos;
-
repository service