Eliminate SET_NB_CFG_54 option. There was no board that

deselected it, and very likely there won't ever be any
hardware that requires it deselected.

Keep the "selected" code path around, leading to no
functional change.

Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Acked-by: Scott Duplichan <scott@notabs.org>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6086 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2010-11-18 00:11:32 +00:00 committed by Patrick Georgi
parent 361bd10bce
commit d28c2986d6
64 changed files with 0 additions and 236 deletions

View File

@ -1,10 +1,5 @@
/* 2004.12 yhlu add dual core support */
#ifndef SET_NB_CFG_54
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore_id.c"
#include <pc80/mc146818rtc.h>
#if CONFIG_HAVE_OPTION_TABLE
@ -20,7 +15,6 @@ static inline unsigned get_core_num_in_bsp(unsigned nodeid)
return dword;
}
#if SET_NB_CFG_54 == 1
static inline uint8_t set_apicid_cpuid_lo(void)
{
#if CONFIG_K8_REV_F_SUPPORT == 0
@ -35,11 +29,6 @@ static inline uint8_t set_apicid_cpuid_lo(void)
return 1;
}
#else
static inline void set_apicid_cpuid_lo(void) { }
#endif
static inline void real_start_other_core(unsigned nodeid)
{

View File

@ -24,10 +24,6 @@
#include "option_table.h"
#endif
#ifndef SET_NB_CFG_54
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/quadcore/quadcore_id.c"
static u32 get_core_num_in_bsp(u32 nodeid)
@ -43,7 +39,6 @@ static u32 get_core_num_in_bsp(u32 nodeid)
return dword;
}
#if SET_NB_CFG_54 == 1
static u8 set_apicid_cpuid_lo(void)
{
// set the NB_CFG[54]=1; why the OS will be happy with that ???
@ -54,12 +49,6 @@ static u8 set_apicid_cpuid_lo(void)
return 1;
}
#else
static void set_apicid_cpuid_lo(void) { }
#endif
static void real_start_other_core(u32 nodeid, u32 cores)
{

View File

@ -17,10 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#define RC0 (6<<8)
#define RC1 (7<<8)

View File

@ -17,10 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#define RC0 (6<<8)
#define RC1 (7<<8)

View File

@ -21,8 +21,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
//used by incoherent_ht
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 0

View File

@ -17,10 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#define DIMM0 0x50
#define DIMM1 0x51

View File

@ -1,8 +1,6 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define SET_NB_CFG_54 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -1,5 +1,3 @@
#define SET_NB_CFG_54 1
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -21,8 +21,6 @@
//#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
//used by incoherent_ht
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 0

View File

@ -21,8 +21,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
//used by incoherent_ht
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 0

View File

@ -73,9 +73,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "lib/generic_sdram.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"
#include "cpu/amd/car/post_cache_as_ram.c"

View File

@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#define RC0 (6<<8)
#define RC1 (7<<8)

View File

@ -24,10 +24,6 @@
/* Used by it8712f_enable_serial(). */
#define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1)
#if CONFIG_LOGICAL_CPUS == 1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -21,8 +21,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
//used by incoherent_ht
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 0

View File

@ -1,8 +1,3 @@
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -24,8 +24,6 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define SET_NB_CFG_54 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -21,10 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -22,8 +22,6 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define SET_NB_CFG_54 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -19,10 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -21,8 +21,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -21,8 +21,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
//used by incoherent_ht
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 0

View File

@ -1,8 +1,3 @@
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -25,10 +25,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -28,11 +28,6 @@
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 1
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -70,9 +69,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "lib/generic_sdram.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"
#include "cpu/amd/car/post_cache_as_ram.c"

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -70,9 +69,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "lib/generic_sdram.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"
#include "cpu/amd/car/post_cache_as_ram.c"

View File

@ -21,10 +21,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
//used by raminit
//used by incoherent_ht
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 0

View File

@ -1,5 +1,3 @@
#define SET_NB_CFG_54 1
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -1,5 +1,3 @@
#define SET_NB_CFG_54 1
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -1,5 +1,3 @@
#define SET_NB_CFG_54 1
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -22,8 +22,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
//#define SYSTEM_TYPE 2 /* MOBILE */
#define SET_NB_CFG_54 1
//used by incoherent_ht
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 0

View File

@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#define RC0 (6<<8)
#define RC1 (7<<8)

View File

@ -24,10 +24,6 @@
#define SERIAL_DEV PNP_DEV(0x4e, W83627THG_SP1)
#if CONFIG_LOGICAL_CPUS == 1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -23,7 +23,6 @@
#define __PRE_RAM__
#define SET_NB_CFG_54 1 /* Used by RAM init. */
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -20,10 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS == 1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -23,8 +23,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define SET_NB_CFG_54 1
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -22,8 +22,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define SET_NB_CFG_54 1
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -22,11 +22,6 @@
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 1
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -4,7 +4,6 @@
* Additional (C) 2007 coresystems GmbH
*/
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -80,9 +79,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
/* newisys khepri does not want the default */
#include "resourcemap.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"

View File

@ -22,8 +22,6 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define SET_NB_CFG_54 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -19,10 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -1,8 +1,3 @@
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -22,8 +22,6 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define SET_NB_CFG_54 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -16,10 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -22,8 +22,6 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define SET_NB_CFG_54 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -19,10 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -22,11 +22,6 @@
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 1
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -22,11 +22,6 @@
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 1
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -17,10 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#define RC0 (6<<8)
#define RC1 (7<<8)

View File

@ -17,10 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#define RC0 (6<<8)
#define RC1 (7<<8)

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -67,9 +66,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "lib/generic_sdram.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -68,9 +67,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "lib/generic_sdram.c"
#include "northbridge/amd/amdk8/resourcemap.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -68,9 +67,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "lib/generic_sdram.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"

View File

@ -1,8 +1,3 @@
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -68,9 +67,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "lib/generic_sdram.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"
#include "cpu/amd/car/post_cache_as_ram.c"

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -70,9 +69,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
/* tyan does not want the default */
#include "resourcemap.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"

View File

@ -1,7 +1,3 @@
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -1,8 +1,3 @@
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -1,7 +1,3 @@
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -22,8 +22,6 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define SET_NB_CFG_54 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>

View File

@ -19,10 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#if CONFIG_K8_REV_F_SUPPORT == 1
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#endif

View File

@ -22,11 +22,6 @@
#define FAM10_SCAN_PCI_BUS 0
#define FAM10_ALLOCATE_IO_RANGE 1
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -84,9 +83,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
/* tyan does not want the default */
#include "resourcemap.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"
#define RC0 ((1<<2)<<8)

View File

@ -1,4 +1,3 @@
#include <stdint.h>
#include <string.h>
#include <device/pci_def.h>
@ -92,9 +91,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
/* tyan does not want the default */
#include "resourcemap.c"
#if CONFIG_LOGICAL_CPUS==1
#define SET_NB_CFG_54 1
#endif
#include "cpu/amd/dualcore/dualcore.c"
#define RC0 ((1<<2)<<8)