Replace dual_core and quad_core CMOS (nvram) options with multi_core. Fix some white...

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5380 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c
index 42d96c509a67affa9e92a436865ca6f45b7f6c3f..28a813c6a56f4021df6099507b2da4b3de15381b 100644 (file)
--- a/src/cpu/amd/dualcore/amd_sibling.c
+++ b/src/cpu/amd/dualcore/amd_sibling.c
@@ -61,7 +61,7 @@ unsigned get_apicid_base(unsigned ioapic_num)
        unsigned nb_cfg_54;
         int bsp_apic_id = lapicid(); // bsp apicid
 
-        get_option(&disable_siblings, "dual_core");
+        get_option(&disable_siblings, "multi_core");
 
         //get the nodes number
         dev = dev_find_slot(0, PCI_DEVFN(0x18,0));
@@ -129,7 +129,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(&disable_siblings, "dual_core");
+               get_option(&disable_siblings, "multi_core");
        }
        result = cpuid(0x80000008);
        /* See how many sibling cpus we have */

diff --git a/src/cpu/amd/dualcore/dualcore.c b/src/cpu/amd/dualcore/dualcore.c
index 331c75909a98923d216df2d3a6b83ae4769dbfba..68b595a539e67e85a31f8ca7edf4501127c4f5a0 100644 (file)
--- a/src/cpu/amd/dualcore/dualcore.c
+++ b/src/cpu/amd/dualcore/dualcore.c
@@ -57,8 +57,8 @@ static inline void start_other_cores(void)
        unsigned nodeid;
 
        if (CONFIG_HAVE_OPTION_TABLE &&
-           read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0)  {
-               return; // disable dual_core
+           read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0)  {
+               return; // disable multi_core
        }
 
         nodes = get_nodes();

diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c
index e701b4e8dbdcbafad8fd6b7c3cb77dac7ee76097..3b0f574c689d415e0efc98a221e47eb309ee1334 100644 (file)
--- a/src/cpu/amd/model_10xxx/init_cpus.c
+++ b/src/cpu/amd/model_10xxx/init_cpus.c
@@ -131,7 +131,7 @@ static void for_each_ap(u32 bsp_apicid, u32 core_range,
        disable_siblings = !CONFIG_LOGICAL_CPUS;
 
 #if CONFIG_LOGICAL_CPUS == 1
-       if(read_option(CMOS_VSTART_quad_core, CMOS_VLEN_quad_core, 0) != 0) { // 0 mean quad core
+       if(read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 mean multi core
                disable_siblings = 1;
        }
 #endif

diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c
index 151eb6f01c52a9e80466cd9d6775ab8556ab4cbc..6b6ebaea814b7c5fc7a843d5795c60dc2feb7e16 100644 (file)
--- a/src/cpu/amd/model_fxx/init_cpus.c
+++ b/src/cpu/amd/model_fxx/init_cpus.c
@@ -57,7 +57,7 @@ static void for_each_ap(unsigned bsp_apicid, unsigned core_range, process_ap_t p
 
         disable_siblings = !CONFIG_LOGICAL_CPUS;
 #if CONFIG_LOGICAL_CPUS == 1 && CONFIG_HAVE_OPTION_TABLE == 1
-        if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { // 0 mean dual core
+        if(read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 mean multi core
                 disable_siblings = 1;
         }
 #endif

diff --git a/src/cpu/amd/quadcore/amd_sibling.c b/src/cpu/amd/quadcore/amd_sibling.c
index 48917e3d1d1e4bdd924f5efa7762ad68fed2dae3..51849ab56b32fb9fb584201979824cde31b5808f 100644 (file)
--- a/src/cpu/amd/quadcore/amd_sibling.c
+++ b/src/cpu/amd/quadcore/amd_sibling.c
@@ -82,7 +82,7 @@ u32 get_apicid_base(u32 ioapic_num)
 
        u32 disable_siblings = !CONFIG_LOGICAL_CPUS;
 
-       get_option(&disable_siblings, "quad_core");
+       get_option(&disable_siblings, "multi_core");
 
        siblings = get_max_siblings(sysconf.nodes);
 

diff --git a/src/cpu/amd/quadcore/quadcore.c b/src/cpu/amd/quadcore/quadcore.c
index 56b59eec5fb2a6734ef86af5a5fbc61e1102fe71..d66f56c881af1bb19d753b4a4e57f956660b84b1 100644 (file)
--- a/src/cpu/amd/quadcore/quadcore.c
+++ b/src/cpu/amd/quadcore/quadcore.c
@@ -86,8 +86,8 @@ static void start_other_cores(void)
        u32 nodes;
        u32 nodeid;
 
-       // disable quad_core
-       if (read_option(CMOS_VSTART_quad_core, CMOS_VLEN_quad_core, 0) != 0)  {
+       // disable multi_core
+       if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0)  {
                printk(BIOS_DEBUG, "Skip additional core init\n");
                return;
        }

diff --git a/src/mainboard/amd/db800/cmos.layout b/src/mainboard/amd/db800/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/amd/db800/cmos.layout
+++ b/src/mainboard/amd/db800/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout
index 54b30d09aa86b2825f624cade02ecb31eb088c6d..422651620910b227e09295686122af75b72eb736 100644 (file)
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/amd/mahogany/cmos.layout b/src/mainboard/amd/mahogany/cmos.layout
index 7d34e3f29606cea660c00390534be89e69767ea8..4fc71828eb739d48d79129bfdcd6ad7f731f0a0e 100644 (file)
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/amd/mahogany_fam10/cmos.layout b/src/mainboard/amd/mahogany_fam10/cmos.layout
index 97b7043e919d8282aa8c58b63f889261381986e7..53fdef5b0a84276a5474f455336afbc7f947b11f 100644 (file)
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        quad_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/amd/norwich/cmos.layout b/src/mainboard/amd/norwich/cmos.layout
index 7b3fe21b499d74a96ad0f3cd88f194c74abcbcc2..864d89ad2a3f0a7e6d119c67e5cd60ab9b2f0c32 100644 (file)
--- a/src/mainboard/amd/norwich/cmos.layout
+++ b/src/mainboard/amd/norwich/cmos.layout
@@ -35,8 +35,8 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
-440         1       e       0        dcon_present
+432          8       h       0        boot_countdown
+440          1       e       0        dcon_present
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/amd/pistachio/cmos.layout b/src/mainboard/amd/pistachio/cmos.layout
index 54b30d09aa86b2825f624cade02ecb31eb088c6d..422651620910b227e09295686122af75b72eb736 100644 (file)
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/amd/rumba/cmos.layout b/src/mainboard/amd/rumba/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/amd/rumba/cmos.layout
+++ b/src/mainboard/amd/rumba/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/amd/serengeti_cheetah/cmos.layout b/src/mainboard/amd/serengeti_cheetah/cmos.layout
index 77ad6b5593d660530e326d3717476359eead3fd7..53fdef5b0a84276a5474f455336afbc7f947b11f 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index 97b7043e919d8282aa8c58b63f889261381986e7..53fdef5b0a84276a5474f455336afbc7f947b11f 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        quad_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/arima/hdama/cmos.layout b/src/mainboard/arima/hdama/cmos.layout
index 7e20f4ce9c77882cb3b5e44be4d9ed6e747441ba..d8e2eeec0944adc335de527be51d7d667d3a40bf 100644 (file)
--- a/src/mainboard/arima/hdama/cmos.layout
+++ b/src/mainboard/arima/hdama/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399          1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/artecgroup/dbe61/cmos.layout b/src/mainboard/artecgroup/dbe61/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/artecgroup/dbe61/cmos.layout
+++ b/src/mainboard/artecgroup/dbe61/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/asrock/939a785gmh/cmos.layout b/src/mainboard/asrock/939a785gmh/cmos.layout
index 7d34e3f29606cea660c00390534be89e69767ea8..4fc71828eb739d48d79129bfdcd6ad7f731f0a0e 100644 (file)
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/asus/a8n_e/cmos.layout b/src/mainboard/asus/a8n_e/cmos.layout
index 3ab00b4bc1cf0997b62ec582140688b1df074037..726de26d76ea7ffc2be14c94b193f55c1e0bda4a 100644 (file)
--- a/src/mainboard/asus/a8n_e/cmos.layout
+++ b/src/mainboard/asus/a8n_e/cmos.layout
@@ -31,7 +31,7 @@ entries
     395 1 e 1 hw_scrubber
     396 1 e 1 interleave_chip_selects
     397 2 e 8 max_mem_clock
-    399 1 e 2 dual_core
+    399 1 e 2 multi_core
     400 1 e 1 power_on_after_fail
     412 4 e 6 debug_level
     416 4 e 7 boot_first

diff --git a/src/mainboard/asus/a8v-e_se/cmos.layout b/src/mainboard/asus/a8v-e_se/cmos.layout
index 408224914efd60902dfeadb0d45a09a29711752a..fc13a3c514330d09a9de9636d4ceb297dce7ade1 100644 (file)
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -32,7 +32,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399         1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/asus/m2v-mx_se/cmos.layout b/src/mainboard/asus/m2v-mx_se/cmos.layout
index 66e1c44d1d87e72337d4b27e0f76176a57579dd5..f2e90e7417d41c7c26c7b402877c236281d9c1d2 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -32,7 +32,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399         1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/asus/mew-vm/cmos.layout b/src/mainboard/asus/mew-vm/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/asus/mew-vm/cmos.layout
+++ b/src/mainboard/asus/mew-vm/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/bcom/winnetp680/cmos.layout b/src/mainboard/bcom/winnetp680/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/bcom/winnetp680/cmos.layout
+++ b/src/mainboard/bcom/winnetp680/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/broadcom/blast/cmos.layout b/src/mainboard/broadcom/blast/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/dell/s1850/cmos.layout b/src/mainboard/dell/s1850/cmos.layout
index df4f4dfcfc0b0f07426e83487d4ad4d50c87b040..81f1a69756afa9a1cc00105a351101f0f847dafa 100644 (file)
--- a/src/mainboard/dell/s1850/cmos.layout
+++ b/src/mainboard/dell/s1850/cmos.layout
@@ -36,7 +36,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers

diff --git a/src/mainboard/digitallogic/adl855pc/cmos.layout b/src/mainboard/digitallogic/adl855pc/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/cmos.layout
+++ b/src/mainboard/digitallogic/adl855pc/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/digitallogic/msm586seg/cmos.layout b/src/mainboard/digitallogic/msm586seg/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/cmos.layout
+++ b/src/mainboard/digitallogic/msm586seg/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/digitallogic/msm800sev/cmos.layout b/src/mainboard/digitallogic/msm800sev/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/digitallogic/msm800sev/cmos.layout
+++ b/src/mainboard/digitallogic/msm800sev/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/eaglelion/5bcm/cmos.layout b/src/mainboard/eaglelion/5bcm/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/eaglelion/5bcm/cmos.layout
+++ b/src/mainboard/eaglelion/5bcm/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/emulation/qemu-x86/cmos.layout b/src/mainboard/emulation/qemu-x86/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/emulation/qemu-x86/cmos.layout
+++ b/src/mainboard/emulation/qemu-x86/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index 61ec7fcd9b6f3e8b24a324271a12c5c389e81369..518f9458b698c637260b1df5ed68c682c06f9c9c 100644 (file)
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index 10a8e9fce9cfd88b5e5c4b694aa5fcab39117948..9d37e2bba61f0ed9138fb24d7017a6bceec58778 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/hp/dl145_g3/cmos.layout b/src/mainboard/hp/dl145_g3/cmos.layout
index 4d49af7f5f909f08070709b79ff1fd5626b581cc..53fdef5b0a84276a5474f455336afbc7f947b11f 100644 (file)
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/ibm/e325/cmos.layout b/src/mainboard/ibm/e325/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/ibm/e325/cmos.layout
+++ b/src/mainboard/ibm/e325/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/ibm/e326/cmos.layout b/src/mainboard/ibm/e326/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/ibm/e326/cmos.layout
+++ b/src/mainboard/ibm/e326/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/iei/juki-511p/cmos.layout b/src/mainboard/iei/juki-511p/cmos.layout
index 276ae66a01cbe1d42f22853f343b854e20e84af8..67a3ce4744989906baf19a0e816d3c68615aa25f 100644 (file)
--- a/src/mainboard/iei/juki-511p/cmos.layout
+++ b/src/mainboard/iei/juki-511p/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/iei/nova4899r/cmos.layout b/src/mainboard/iei/nova4899r/cmos.layout
index 276ae66a01cbe1d42f22853f343b854e20e84af8..67a3ce4744989906baf19a0e816d3c68615aa25f 100644 (file)
--- a/src/mainboard/iei/nova4899r/cmos.layout
+++ b/src/mainboard/iei/nova4899r/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/intel/jarrell/cmos.layout b/src/mainboard/intel/jarrell/cmos.layout
index ba7f604a4d13f80e642c3545c6d1164ced3632f6..1f225f833c431d8c65d1a9f41d4389fa8be527fa 100644 (file)
--- a/src/mainboard/intel/jarrell/cmos.layout
+++ b/src/mainboard/intel/jarrell/cmos.layout
@@ -24,7 +24,7 @@ entries
 #95           1       r       0        disable_clock_updates
 #96         288       r       0        temporary_filler
 0          376       r       0        reserved_memory
-376         1       e       1        power_up_watchdog
+376          1       e       1        power_up_watchdog
 384          1       e       4        boot_option
 385          1       e       4        last_boot
 386          1       e       1        ECC_memory
@@ -38,7 +38,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers

diff --git a/src/mainboard/intel/xe7501devkit/cmos.layout b/src/mainboard/intel/xe7501devkit/cmos.layout
index 39cfc31784eadda07663c11f61764dc8658126f1..494af5bb61ee435d8cb7f30b8da1564447350773 100644 (file)
--- a/src/mainboard/intel/xe7501devkit/cmos.layout
+++ b/src/mainboard/intel/xe7501devkit/cmos.layout
@@ -1,16 +1,16 @@
 # NOTE: This file must be in UNIX format (not DOS) or build_opt_tbl fails: 
-#              "Error - Name  is an invalid identifier in line"
+# "Error - Name  is an invalid identifier in line"
 
 entries
 
 #start-bit length  config config-ID    name
-0           512      r       0        reserved_memory1                 # We know nothing about the factory BIOS
-512         512      r       0        reserved_memory2                 # More factory BIOS
+0           512      r       0        reserved_memory1 # We know nothing about the factory BIOS
+512         512      r       0        reserved_memory2 # More factory BIOS
 
 # Work in progress.
 # This is where we would put the LB RTC_BOOT_BYTE options once the code
 # supports finding them there.
-#1024         1       e       4        boot_option             
+#1024         1       e       4        boot_option
 #1025         1       e       4        last_boot
 #1026         1       e       1        ECC_memory
 #1028         4       r       0        reboot_bits

diff --git a/src/mainboard/iwill/dk8_htx/cmos.layout b/src/mainboard/iwill/dk8_htx/cmos.layout
index 77ad6b5593d660530e326d3717476359eead3fd7..53fdef5b0a84276a5474f455336afbc7f947b11f 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/cmos.layout
+++ b/src/mainboard/iwill/dk8_htx/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/iwill/dk8s2/cmos.layout b/src/mainboard/iwill/dk8s2/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/iwill/dk8s2/cmos.layout
+++ b/src/mainboard/iwill/dk8s2/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/iwill/dk8x/cmos.layout b/src/mainboard/iwill/dk8x/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/iwill/dk8x/cmos.layout
+++ b/src/mainboard/iwill/dk8x/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/jetway/j7f24/cmos.layout b/src/mainboard/jetway/j7f24/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/jetway/j7f24/cmos.layout
+++ b/src/mainboard/jetway/j7f24/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout
index 54b30d09aa86b2825f624cade02ecb31eb088c6d..422651620910b227e09295686122af75b72eb736 100644 (file)
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/lippert/frontrunner/cmos.layout b/src/mainboard/lippert/frontrunner/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/lippert/frontrunner/cmos.layout
+++ b/src/mainboard/lippert/frontrunner/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/msi/ms7135/cmos.layout b/src/mainboard/msi/ms7135/cmos.layout
index 4d49af7f5f909f08070709b79ff1fd5626b581cc..53fdef5b0a84276a5474f455336afbc7f947b11f 100644 (file)
--- a/src/mainboard/msi/ms7135/cmos.layout
+++ b/src/mainboard/msi/ms7135/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/msi/ms7260/cmos.layout b/src/mainboard/msi/ms7260/cmos.layout
index ed82c0b8f1140c0626f393e75275226ce97ad2e3..51f4a6c598b2d4523ac6e64404ce6a07ed9b5cc2 100644 (file)
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -54,14 +54,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/msi/ms9185/cmos.layout b/src/mainboard/msi/ms9185/cmos.layout
index 4d49af7f5f909f08070709b79ff1fd5626b581cc..1c6a3cde86bb218ffc66fefb1c4bb147d75cf4fb 100644 (file)
--- a/src/mainboard/msi/ms9185/cmos.layout
+++ b/src/mainboard/msi/ms9185/cmos.layout
@@ -32,7 +32,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399         1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/msi/ms9282/cmos.layout b/src/mainboard/msi/ms9282/cmos.layout
index 408224914efd60902dfeadb0d45a09a29711752a..238b4cec75ac3eb9b1c1757aed6d70df44fceb28 100644 (file)
--- a/src/mainboard/msi/ms9282/cmos.layout
+++ b/src/mainboard/msi/ms9282/cmos.layout
@@ -32,7 +32,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index 419ac87c2d456ed8f9845703cf82ec0a8bc2c5d3..518f9458b698c637260b1df5ed68c682c06f9c9c 100644 (file)
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -53,7 +53,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399          1       e       2        quad_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/newisys/khepri/cmos.layout b/src/mainboard/newisys/khepri/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/newisys/khepri/cmos.layout
+++ b/src/mainboard/newisys/khepri/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout
index 958843ab2241c3e11be17c53eae1b5fcb1c55d2b..518f9458b698c637260b1df5ed68c682c06f9c9c 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -53,7 +53,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399          1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/olpc/btest/cmos.layout b/src/mainboard/olpc/btest/cmos.layout
index 7b3fe21b499d74a96ad0f3cd88f194c74abcbcc2..864d89ad2a3f0a7e6d119c67e5cd60ab9b2f0c32 100644 (file)
--- a/src/mainboard/olpc/btest/cmos.layout
+++ b/src/mainboard/olpc/btest/cmos.layout
@@ -35,8 +35,8 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
-440         1       e       0        dcon_present
+432          8       h       0        boot_countdown
+440          1       e       0        dcon_present
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/olpc/rev_a/cmos.layout b/src/mainboard/olpc/rev_a/cmos.layout
index 7b3fe21b499d74a96ad0f3cd88f194c74abcbcc2..864d89ad2a3f0a7e6d119c67e5cd60ab9b2f0c32 100644 (file)
--- a/src/mainboard/olpc/rev_a/cmos.layout
+++ b/src/mainboard/olpc/rev_a/cmos.layout
@@ -35,8 +35,8 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
-440         1       e       0        dcon_present
+432          8       h       0        boot_countdown
+440          1       e       0        dcon_present
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/pcengines/alix1c/cmos.layout b/src/mainboard/pcengines/alix1c/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/pcengines/alix1c/cmos.layout
+++ b/src/mainboard/pcengines/alix1c/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/sunw/ultra40/cmos.layout b/src/mainboard/sunw/ultra40/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/sunw/ultra40/cmos.layout
+++ b/src/mainboard/sunw/ultra40/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout
index 10a8e9fce9cfd88b5e5c4b694aa5fcab39117948..9d37e2bba61f0ed9138fb24d7017a6bceec58778 100644 (file)
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/supermicro/h8dmr/cmos.layout b/src/mainboard/supermicro/h8dmr/cmos.layout
index 10a8e9fce9cfd88b5e5c4b694aa5fcab39117948..9d37e2bba61f0ed9138fb24d7017a6bceec58778 100644 (file)
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index 5ffec3abc9210efa8f13ecc8ab86a5ae674b1b59..9d37e2bba61f0ed9138fb24d7017a6bceec58778 100644 (file)
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399          1       e       2        quad_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index 5ffec3abc9210efa8f13ecc8ab86a5ae674b1b59..9d37e2bba61f0ed9138fb24d7017a6bceec58778 100644 (file)
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399          1       e       2        quad_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/supermicro/x6dai_g/cmos.layout b/src/mainboard/supermicro/x6dai_g/cmos.layout
index df4f4dfcfc0b0f07426e83487d4ad4d50c87b040..81f1a69756afa9a1cc00105a351101f0f847dafa 100644 (file)
--- a/src/mainboard/supermicro/x6dai_g/cmos.layout
+++ b/src/mainboard/supermicro/x6dai_g/cmos.layout
@@ -36,7 +36,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers

diff --git a/src/mainboard/supermicro/x6dhe_g/cmos.layout b/src/mainboard/supermicro/x6dhe_g/cmos.layout
index df4f4dfcfc0b0f07426e83487d4ad4d50c87b040..81f1a69756afa9a1cc00105a351101f0f847dafa 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g/cmos.layout
+++ b/src/mainboard/supermicro/x6dhe_g/cmos.layout
@@ -36,7 +36,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers

diff --git a/src/mainboard/supermicro/x6dhe_g2/cmos.layout b/src/mainboard/supermicro/x6dhe_g2/cmos.layout
index df4f4dfcfc0b0f07426e83487d4ad4d50c87b040..81f1a69756afa9a1cc00105a351101f0f847dafa 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g2/cmos.layout
+++ b/src/mainboard/supermicro/x6dhe_g2/cmos.layout
@@ -36,7 +36,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers

diff --git a/src/mainboard/supermicro/x6dhr_ig/cmos.layout b/src/mainboard/supermicro/x6dhr_ig/cmos.layout
index df4f4dfcfc0b0f07426e83487d4ad4d50c87b040..81f1a69756afa9a1cc00105a351101f0f847dafa 100644 (file)
--- a/src/mainboard/supermicro/x6dhr_ig/cmos.layout
+++ b/src/mainboard/supermicro/x6dhr_ig/cmos.layout
@@ -36,7 +36,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers

diff --git a/src/mainboard/supermicro/x6dhr_ig2/cmos.layout b/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
index df4f4dfcfc0b0f07426e83487d4ad4d50c87b040..81f1a69756afa9a1cc00105a351101f0f847dafa 100644 (file)
--- a/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
+++ b/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
@@ -36,7 +36,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers

diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout
index 54b30d09aa86b2825f624cade02ecb31eb088c6d..422651620910b227e09295686122af75b72eb736 100644 (file)
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/technexion/tim8690/cmos.layout b/src/mainboard/technexion/tim8690/cmos.layout
index 54b30d09aa86b2825f624cade02ecb31eb088c6d..422651620910b227e09295686122af75b72eb736 100644 (file)
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -53,14 +53,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/technologic/ts5300/cmos.layout b/src/mainboard/technologic/ts5300/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/technologic/ts5300/cmos.layout
+++ b/src/mainboard/technologic/ts5300/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/tyan/s2735/cmos.layout b/src/mainboard/tyan/s2735/cmos.layout
index 9afd72c97851a3a9e9a237f048aacb4900f0866d..ccda70c8088391df84a0b005d82fd8ab95907b8a 100644 (file)
--- a/src/mainboard/tyan/s2735/cmos.layout
+++ b/src/mainboard/tyan/s2735/cmos.layout
@@ -38,7 +38,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 #440          4       e       9        slow_cpu
 444          1       e       1        nmi
 728        256       h       0        user_data

diff --git a/src/mainboard/tyan/s2850/cmos.layout b/src/mainboard/tyan/s2850/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2850/cmos.layout
+++ b/src/mainboard/tyan/s2850/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2875/cmos.layout b/src/mainboard/tyan/s2875/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2875/cmos.layout
+++ b/src/mainboard/tyan/s2875/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2880/cmos.layout b/src/mainboard/tyan/s2880/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2880/cmos.layout
+++ b/src/mainboard/tyan/s2880/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2881/cmos.layout b/src/mainboard/tyan/s2881/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2881/cmos.layout
+++ b/src/mainboard/tyan/s2881/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2882/cmos.layout b/src/mainboard/tyan/s2882/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2882/cmos.layout
+++ b/src/mainboard/tyan/s2882/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2885/cmos.layout b/src/mainboard/tyan/s2885/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2885/cmos.layout
+++ b/src/mainboard/tyan/s2885/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2891/cmos.layout b/src/mainboard/tyan/s2891/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2891/cmos.layout
+++ b/src/mainboard/tyan/s2891/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2892/cmos.layout b/src/mainboard/tyan/s2892/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2892/cmos.layout
+++ b/src/mainboard/tyan/s2892/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2895/cmos.layout b/src/mainboard/tyan/s2895/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s2895/cmos.layout
+++ b/src/mainboard/tyan/s2895/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout
index 958843ab2241c3e11be17c53eae1b5fcb1c55d2b..518f9458b698c637260b1df5ed68c682c06f9c9c 100644 (file)
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -53,7 +53,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399          1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index 419ac87c2d456ed8f9845703cf82ec0a8bc2c5d3..518f9458b698c637260b1df5ed68c682c06f9c9c 100644 (file)
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -53,7 +53,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399          1       e       2        quad_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first

diff --git a/src/mainboard/tyan/s4880/cmos.layout b/src/mainboard/tyan/s4880/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s4880/cmos.layout
+++ b/src/mainboard/tyan/s4880/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/tyan/s4882/cmos.layout b/src/mainboard/tyan/s4882/cmos.layout
index a7748b7f9d6f2f42ca6aadeebfbc4341ef331f43..924934c1374e46eeced3d41dcb42054b7c74146f 100644 (file)
--- a/src/mainboard/tyan/s4882/cmos.layout
+++ b/src/mainboard/tyan/s4882/cmos.layout
@@ -32,14 +32,14 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
-399         1       e       2        dual_core
+399          1       e       2        multi_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu

diff --git a/src/mainboard/via/epia-cn/cmos.layout b/src/mainboard/via/epia-cn/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/via/epia-cn/cmos.layout
+++ b/src/mainboard/via/epia-cn/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/via/epia-m/cmos.layout b/src/mainboard/via/epia-m/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/via/epia-m/cmos.layout
+++ b/src/mainboard/via/epia-m/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/via/epia-m700/cmos.layout b/src/mainboard/via/epia-m700/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/via/epia-m700/cmos.layout
+++ b/src/mainboard/via/epia-m700/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/via/epia-n/cmos.layout b/src/mainboard/via/epia-n/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/via/epia-n/cmos.layout
+++ b/src/mainboard/via/epia-n/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/via/epia/cmos.layout b/src/mainboard/via/epia/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/via/epia/cmos.layout
+++ b/src/mainboard/via/epia/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/mainboard/winent/pl6064/cmos.layout b/src/mainboard/winent/pl6064/cmos.layout
index 5ba4c032c188affa3b1bf89d35943a9cc88eead7..c1354a2866feaeadd581311f1b6b018ce04bc92a 100644 (file)
--- a/src/mainboard/winent/pl6064/cmos.layout
+++ b/src/mainboard/winent/pl6064/cmos.layout
@@ -35,7 +35,7 @@ entries
 420          4       e       7        boot_second
 424          4       e       7        boot_third
 428          4       h       0        boot_index
-432         8       h       0        boot_countdown
+432          8       h       0        boot_countdown
 1008         16      h       0        check_sum
 
 enumerations

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 535501d15f46a32301997060b9f455ba64680a6d..04d06478e2474854a382ff3e89700a4209a6f640 100644 (file)
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -1234,7 +1234,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
 
        disable_siblings = !CONFIG_LOGICAL_CPUS;
 #if CONFIG_LOGICAL_CPUS == 1
-       get_option(&disable_siblings, "quad_core");
+       get_option(&disable_siblings, "multi_core");
 #endif
 
        // for pre_e0, nb_cfg_54 can not be set, ( even set, when you read it

diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c
index 9a60ecc03eee22c09a97d57c9a5c9f287d7ecb13..1b0feb123addc892f0f9801eb32621268739952c 100644 (file)
--- a/src/northbridge/amd/amdk8/coherent_ht.c
+++ b/src/northbridge/amd/amdk8/coherent_ht.c
@@ -1595,7 +1595,7 @@ static void coherent_ht_finalize(unsigned nodes)
        unsigned total_cpus;
 
        if ((!CONFIG_HAVE_OPTION_TABLE) ||
-           read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) == 0) { /* dual_core */
+           read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) == 0) { /* multi_core */
                total_cpus = verify_dualcore(nodes);
        }
        else {

diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 3d853378d835394650fd4e57487c6989c7349dd0..373501c9ad69f5d659d296ebed58fa2c0934dfb0 100644 (file)
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1142,7 +1142,7 @@ static unsigned int cpu_bus_scan(device_t dev, unsigned int max)
 
        disable_siblings = !CONFIG_LOGICAL_CPUS;
 #if CONFIG_LOGICAL_CPUS == 1
-       get_option(&disable_siblings, "dual_core");
+       get_option(&disable_siblings, "multi_core");
 #endif
 
        // for pre_e0, nb_cfg_54 can not be set, ( even set, when you read it still be 0)