Revert "CMOS: Add set_option and rework get_option."
This reverts commit eb7bb49eb5b48c39baf7a256b7c74e23e3da5660. Stepan pointed out that "s" means string, which makes the following statement in this commit message invalid: "Since we either have reserved space (which we shouldn't do anything with in these two functions), an enum or a hexadecimal value, unsigned int seemed like the way to go." Signed-off-by: Luc Verhaegen <libv@skynet.be> Acked-by: Luc Verhaegen <libv@skynet.be> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4335 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@ -14,7 +14,7 @@
|
||||
#include <cpu/amd/amdk8_sysconf.h>
|
||||
|
||||
static int first_time = 1;
|
||||
static uint32_t disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
static int disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
|
||||
#include "dualcore_id.c"
|
||||
|
||||
@ -62,7 +62,7 @@ unsigned get_apicid_base(unsigned ioapic_num)
|
||||
unsigned nb_cfg_54;
|
||||
int bsp_apic_id = lapicid(); // bsp apicid
|
||||
|
||||
get_option("dual_core", &disable_siblings);
|
||||
get_option(&disable_siblings, "dual_core");
|
||||
|
||||
//get the nodes number
|
||||
dev = dev_find_slot(0, PCI_DEVFN(0x18,0));
|
||||
@ -127,7 +127,7 @@ void amd_sibling_init(device_t cpu)
|
||||
/* On the bootstrap processor see if I want sibling cpus enabled */
|
||||
if (first_time) {
|
||||
first_time = 0;
|
||||
get_option("dual_core", &disable_siblings);
|
||||
get_option(&disable_siblings, "dual_core");
|
||||
}
|
||||
result = cpuid(0x80000008);
|
||||
/* See how many sibling cpus we have */
|
||||
|
@ -248,7 +248,7 @@ static void init_ecc_memory(unsigned node_id)
|
||||
struct mtrr_state mtrr_state;
|
||||
|
||||
device_t f1_dev, f2_dev, f3_dev;
|
||||
uint32_t enable_scrubbing;
|
||||
int enable_scrubbing;
|
||||
uint32_t dcl;
|
||||
|
||||
f1_dev = dev_find_slot(0, PCI_DEVFN(0x18 + node_id, 1));
|
||||
@ -266,7 +266,7 @@ static void init_ecc_memory(unsigned node_id)
|
||||
|
||||
/* See if we scrubbing should be enabled */
|
||||
enable_scrubbing = 1;
|
||||
get_option("hw_scrubber", &enable_scrubbing);
|
||||
get_option(&enable_scrubbing, "hw_scrubber");
|
||||
|
||||
/* Enable cache scrubbing at the lowest possible rate */
|
||||
if (enable_scrubbing) {
|
||||
|
@ -82,7 +82,7 @@ u32 get_apicid_base(u32 ioapic_num)
|
||||
|
||||
u32 disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
|
||||
get_option("quad_core", &disable_siblings);
|
||||
get_option(&disable_siblings, "quad_core");
|
||||
|
||||
siblings = get_max_siblings(sysconf.nodes);
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include <smp/spinlock.h>
|
||||
|
||||
static int first_time = 1;
|
||||
static uint32_t disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
static int disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
|
||||
void intel_sibling_init(device_t cpu)
|
||||
{
|
||||
@ -17,7 +17,7 @@ void intel_sibling_init(device_t cpu)
|
||||
/* On the bootstrap processor see if I want sibling cpus enabled */
|
||||
if (first_time) {
|
||||
first_time = 0;
|
||||
get_option("hyper_threading", &disable_siblings);
|
||||
get_option(&disable_siblings, "hyper_threading");
|
||||
}
|
||||
result = cpuid(1);
|
||||
/* Is hyperthreading supported */
|
||||
|
Reference in New Issue
Block a user