[coreboot] [commit] r5380 - in trunk/src: cpu/amd/dualcore cpu/amd/model_10xxx cpu/amd/model_fxx cpu/amd/quadcore mainboard/amd/db800 mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 ...

repository service svn at coreboot.org
Thu Apr 8 17:06:45 CEST 2010


Author: myles
Date: Thu Apr  8 17:06:44 2010
New Revision: 5380
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5380

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

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Myles Watson <mylesgw at gmail.com>

Modified:
   trunk/src/cpu/amd/dualcore/amd_sibling.c
   trunk/src/cpu/amd/dualcore/dualcore.c
   trunk/src/cpu/amd/model_10xxx/init_cpus.c
   trunk/src/cpu/amd/model_fxx/init_cpus.c
   trunk/src/cpu/amd/quadcore/amd_sibling.c
   trunk/src/cpu/amd/quadcore/quadcore.c
   trunk/src/mainboard/amd/db800/cmos.layout
   trunk/src/mainboard/amd/dbm690t/cmos.layout
   trunk/src/mainboard/amd/mahogany/cmos.layout
   trunk/src/mainboard/amd/mahogany_fam10/cmos.layout
   trunk/src/mainboard/amd/norwich/cmos.layout
   trunk/src/mainboard/amd/pistachio/cmos.layout
   trunk/src/mainboard/amd/rumba/cmos.layout
   trunk/src/mainboard/amd/serengeti_cheetah/cmos.layout
   trunk/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
   trunk/src/mainboard/arima/hdama/cmos.layout
   trunk/src/mainboard/artecgroup/dbe61/cmos.layout
   trunk/src/mainboard/asrock/939a785gmh/cmos.layout
   trunk/src/mainboard/asus/a8n_e/cmos.layout
   trunk/src/mainboard/asus/a8v-e_se/cmos.layout
   trunk/src/mainboard/asus/m2v-mx_se/cmos.layout
   trunk/src/mainboard/asus/mew-vm/cmos.layout
   trunk/src/mainboard/bcom/winnetp680/cmos.layout
   trunk/src/mainboard/broadcom/blast/cmos.layout
   trunk/src/mainboard/dell/s1850/cmos.layout
   trunk/src/mainboard/digitallogic/adl855pc/cmos.layout
   trunk/src/mainboard/digitallogic/msm586seg/cmos.layout
   trunk/src/mainboard/digitallogic/msm800sev/cmos.layout
   trunk/src/mainboard/eaglelion/5bcm/cmos.layout
   trunk/src/mainboard/emulation/qemu-x86/cmos.layout
   trunk/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
   trunk/src/mainboard/gigabyte/m57sli/cmos.layout
   trunk/src/mainboard/hp/dl145_g3/cmos.layout
   trunk/src/mainboard/ibm/e325/cmos.layout
   trunk/src/mainboard/ibm/e326/cmos.layout
   trunk/src/mainboard/iei/juki-511p/cmos.layout
   trunk/src/mainboard/iei/nova4899r/cmos.layout
   trunk/src/mainboard/intel/jarrell/cmos.layout
   trunk/src/mainboard/intel/xe7501devkit/cmos.layout
   trunk/src/mainboard/iwill/dk8_htx/cmos.layout
   trunk/src/mainboard/iwill/dk8s2/cmos.layout
   trunk/src/mainboard/iwill/dk8x/cmos.layout
   trunk/src/mainboard/jetway/j7f24/cmos.layout
   trunk/src/mainboard/kontron/kt690/cmos.layout
   trunk/src/mainboard/lippert/frontrunner/cmos.layout
   trunk/src/mainboard/msi/ms7135/cmos.layout
   trunk/src/mainboard/msi/ms7260/cmos.layout
   trunk/src/mainboard/msi/ms9185/cmos.layout
   trunk/src/mainboard/msi/ms9282/cmos.layout
   trunk/src/mainboard/msi/ms9652_fam10/cmos.layout
   trunk/src/mainboard/newisys/khepri/cmos.layout
   trunk/src/mainboard/nvidia/l1_2pvv/cmos.layout
   trunk/src/mainboard/olpc/btest/cmos.layout
   trunk/src/mainboard/olpc/rev_a/cmos.layout
   trunk/src/mainboard/pcengines/alix1c/cmos.layout
   trunk/src/mainboard/sunw/ultra40/cmos.layout
   trunk/src/mainboard/supermicro/h8dme/cmos.layout
   trunk/src/mainboard/supermicro/h8dmr/cmos.layout
   trunk/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
   trunk/src/mainboard/supermicro/h8qme_fam10/cmos.layout
   trunk/src/mainboard/supermicro/x6dai_g/cmos.layout
   trunk/src/mainboard/supermicro/x6dhe_g/cmos.layout
   trunk/src/mainboard/supermicro/x6dhe_g2/cmos.layout
   trunk/src/mainboard/supermicro/x6dhr_ig/cmos.layout
   trunk/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
   trunk/src/mainboard/technexion/tim5690/cmos.layout
   trunk/src/mainboard/technexion/tim8690/cmos.layout
   trunk/src/mainboard/technologic/ts5300/cmos.layout
   trunk/src/mainboard/tyan/s2735/cmos.layout
   trunk/src/mainboard/tyan/s2850/cmos.layout
   trunk/src/mainboard/tyan/s2875/cmos.layout
   trunk/src/mainboard/tyan/s2880/cmos.layout
   trunk/src/mainboard/tyan/s2881/cmos.layout
   trunk/src/mainboard/tyan/s2882/cmos.layout
   trunk/src/mainboard/tyan/s2885/cmos.layout
   trunk/src/mainboard/tyan/s2891/cmos.layout
   trunk/src/mainboard/tyan/s2892/cmos.layout
   trunk/src/mainboard/tyan/s2895/cmos.layout
   trunk/src/mainboard/tyan/s2912/cmos.layout
   trunk/src/mainboard/tyan/s2912_fam10/cmos.layout
   trunk/src/mainboard/tyan/s4880/cmos.layout
   trunk/src/mainboard/tyan/s4882/cmos.layout
   trunk/src/mainboard/via/epia-cn/cmos.layout
   trunk/src/mainboard/via/epia-m/cmos.layout
   trunk/src/mainboard/via/epia-m700/cmos.layout
   trunk/src/mainboard/via/epia-n/cmos.layout
   trunk/src/mainboard/via/epia/cmos.layout
   trunk/src/mainboard/winent/pl6064/cmos.layout
   trunk/src/northbridge/amd/amdfam10/northbridge.c
   trunk/src/northbridge/amd/amdk8/coherent_ht.c
   trunk/src/northbridge/amd/amdk8/northbridge.c

Modified: trunk/src/cpu/amd/dualcore/amd_sibling.c
==============================================================================
--- trunk/src/cpu/amd/dualcore/amd_sibling.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/cpu/amd/dualcore/amd_sibling.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -61,7 +61,7 @@
 	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 @@
 	/* 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 */

Modified: trunk/src/cpu/amd/dualcore/dualcore.c
==============================================================================
--- trunk/src/cpu/amd/dualcore/dualcore.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/cpu/amd/dualcore/dualcore.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -57,8 +57,8 @@
 	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();

Modified: trunk/src/cpu/amd/model_10xxx/init_cpus.c
==============================================================================
--- trunk/src/cpu/amd/model_10xxx/init_cpus.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/cpu/amd/model_10xxx/init_cpus.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -131,7 +131,7 @@
 	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

Modified: trunk/src/cpu/amd/model_fxx/init_cpus.c
==============================================================================
--- trunk/src/cpu/amd/model_fxx/init_cpus.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/cpu/amd/model_fxx/init_cpus.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -57,7 +57,7 @@
 
         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

Modified: trunk/src/cpu/amd/quadcore/amd_sibling.c
==============================================================================
--- trunk/src/cpu/amd/quadcore/amd_sibling.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/cpu/amd/quadcore/amd_sibling.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -82,7 +82,7 @@
 
 	u32 disable_siblings = !CONFIG_LOGICAL_CPUS;
 
-	get_option(&disable_siblings, "quad_core");
+	get_option(&disable_siblings, "multi_core");
 
 	siblings = get_max_siblings(sysconf.nodes);
 

Modified: trunk/src/cpu/amd/quadcore/quadcore.c
==============================================================================
--- trunk/src/cpu/amd/quadcore/quadcore.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/cpu/amd/quadcore/quadcore.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -86,8 +86,8 @@
 	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;
 	}

Modified: trunk/src/mainboard/amd/db800/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/db800/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/db800/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/amd/dbm690t/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/dbm690t/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/amd/mahogany/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/mahogany/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/mahogany/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/amd/mahogany_fam10/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/mahogany_fam10/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/mahogany_fam10/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/amd/norwich/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/norwich/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/norwich/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,8 +35,8 @@
 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

Modified: trunk/src/mainboard/amd/pistachio/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/pistachio/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/pistachio/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/amd/rumba/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/rumba/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/rumba/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/amd/serengeti_cheetah/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/serengeti_cheetah/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/arima/hdama/cmos.layout
==============================================================================
--- trunk/src/mainboard/arima/hdama/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/arima/hdama/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/artecgroup/dbe61/cmos.layout
==============================================================================
--- trunk/src/mainboard/artecgroup/dbe61/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/artecgroup/dbe61/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/asrock/939a785gmh/cmos.layout
==============================================================================
--- trunk/src/mainboard/asrock/939a785gmh/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/asrock/939a785gmh/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/asus/a8n_e/cmos.layout
==============================================================================
--- trunk/src/mainboard/asus/a8n_e/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/asus/a8n_e/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -31,7 +31,7 @@
     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

Modified: trunk/src/mainboard/asus/a8v-e_se/cmos.layout
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_se/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/asus/a8v-e_se/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,7 +32,7 @@
 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

Modified: trunk/src/mainboard/asus/m2v-mx_se/cmos.layout
==============================================================================
--- trunk/src/mainboard/asus/m2v-mx_se/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/asus/m2v-mx_se/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,7 +32,7 @@
 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

Modified: trunk/src/mainboard/asus/mew-vm/cmos.layout
==============================================================================
--- trunk/src/mainboard/asus/mew-vm/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/asus/mew-vm/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/bcom/winnetp680/cmos.layout
==============================================================================
--- trunk/src/mainboard/bcom/winnetp680/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/bcom/winnetp680/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/broadcom/blast/cmos.layout
==============================================================================
--- trunk/src/mainboard/broadcom/blast/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/broadcom/blast/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/dell/s1850/cmos.layout
==============================================================================
--- trunk/src/mainboard/dell/s1850/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/dell/s1850/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -36,7 +36,7 @@
 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

Modified: trunk/src/mainboard/digitallogic/adl855pc/cmos.layout
==============================================================================
--- trunk/src/mainboard/digitallogic/adl855pc/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/digitallogic/adl855pc/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/digitallogic/msm586seg/cmos.layout
==============================================================================
--- trunk/src/mainboard/digitallogic/msm586seg/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/digitallogic/msm586seg/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/digitallogic/msm800sev/cmos.layout
==============================================================================
--- trunk/src/mainboard/digitallogic/msm800sev/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/digitallogic/msm800sev/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/eaglelion/5bcm/cmos.layout
==============================================================================
--- trunk/src/mainboard/eaglelion/5bcm/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/eaglelion/5bcm/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/emulation/qemu-x86/cmos.layout
==============================================================================
--- trunk/src/mainboard/emulation/qemu-x86/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/emulation/qemu-x86/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/gigabyte/m57sli/cmos.layout
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/gigabyte/m57sli/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/hp/dl145_g3/cmos.layout
==============================================================================
--- trunk/src/mainboard/hp/dl145_g3/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/hp/dl145_g3/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/ibm/e325/cmos.layout
==============================================================================
--- trunk/src/mainboard/ibm/e325/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/ibm/e325/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/ibm/e326/cmos.layout
==============================================================================
--- trunk/src/mainboard/ibm/e326/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/ibm/e326/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/iei/juki-511p/cmos.layout
==============================================================================
--- trunk/src/mainboard/iei/juki-511p/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/iei/juki-511p/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/iei/nova4899r/cmos.layout
==============================================================================
--- trunk/src/mainboard/iei/nova4899r/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/iei/nova4899r/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/intel/jarrell/cmos.layout
==============================================================================
--- trunk/src/mainboard/intel/jarrell/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/intel/jarrell/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -24,7 +24,7 @@
 #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 @@
 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

Modified: trunk/src/mainboard/intel/xe7501devkit/cmos.layout
==============================================================================
--- trunk/src/mainboard/intel/xe7501devkit/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/intel/xe7501devkit/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -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

Modified: trunk/src/mainboard/iwill/dk8_htx/cmos.layout
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/iwill/dk8_htx/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/iwill/dk8s2/cmos.layout
==============================================================================
--- trunk/src/mainboard/iwill/dk8s2/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/iwill/dk8s2/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/iwill/dk8x/cmos.layout
==============================================================================
--- trunk/src/mainboard/iwill/dk8x/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/iwill/dk8x/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/jetway/j7f24/cmos.layout
==============================================================================
--- trunk/src/mainboard/jetway/j7f24/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/jetway/j7f24/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/kontron/kt690/cmos.layout
==============================================================================
--- trunk/src/mainboard/kontron/kt690/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/kontron/kt690/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/lippert/frontrunner/cmos.layout
==============================================================================
--- trunk/src/mainboard/lippert/frontrunner/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/lippert/frontrunner/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/msi/ms7135/cmos.layout
==============================================================================
--- trunk/src/mainboard/msi/ms7135/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/msi/ms7135/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/msi/ms7260/cmos.layout
==============================================================================
--- trunk/src/mainboard/msi/ms7260/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/msi/ms7260/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -54,14 +54,14 @@
 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

Modified: trunk/src/mainboard/msi/ms9185/cmos.layout
==============================================================================
--- trunk/src/mainboard/msi/ms9185/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/msi/ms9185/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,7 +32,7 @@
 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

Modified: trunk/src/mainboard/msi/ms9282/cmos.layout
==============================================================================
--- trunk/src/mainboard/msi/ms9282/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/msi/ms9282/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,7 +32,7 @@
 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

Modified: trunk/src/mainboard/msi/ms9652_fam10/cmos.layout
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/msi/ms9652_fam10/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,7 +53,7 @@
 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

Modified: trunk/src/mainboard/newisys/khepri/cmos.layout
==============================================================================
--- trunk/src/mainboard/newisys/khepri/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/newisys/khepri/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/nvidia/l1_2pvv/cmos.layout
==============================================================================
--- trunk/src/mainboard/nvidia/l1_2pvv/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/nvidia/l1_2pvv/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,7 +53,7 @@
 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

Modified: trunk/src/mainboard/olpc/btest/cmos.layout
==============================================================================
--- trunk/src/mainboard/olpc/btest/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/olpc/btest/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,8 +35,8 @@
 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

Modified: trunk/src/mainboard/olpc/rev_a/cmos.layout
==============================================================================
--- trunk/src/mainboard/olpc/rev_a/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/olpc/rev_a/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,8 +35,8 @@
 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

Modified: trunk/src/mainboard/pcengines/alix1c/cmos.layout
==============================================================================
--- trunk/src/mainboard/pcengines/alix1c/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/pcengines/alix1c/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/sunw/ultra40/cmos.layout
==============================================================================
--- trunk/src/mainboard/sunw/ultra40/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/sunw/ultra40/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/supermicro/h8dme/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/h8dme/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/h8dme/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/supermicro/h8dmr/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/h8dmr/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr_fam10/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/h8dmr_fam10/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/supermicro/h8qme_fam10/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/h8qme_fam10/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/h8qme_fam10/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/supermicro/x6dai_g/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/x6dai_g/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/x6dai_g/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -36,7 +36,7 @@
 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

Modified: trunk/src/mainboard/supermicro/x6dhe_g/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/x6dhe_g/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -36,7 +36,7 @@
 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

Modified: trunk/src/mainboard/supermicro/x6dhe_g2/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g2/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/x6dhe_g2/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -36,7 +36,7 @@
 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

Modified: trunk/src/mainboard/supermicro/x6dhr_ig/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhr_ig/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/x6dhr_ig/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -36,7 +36,7 @@
 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

Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
==============================================================================
--- trunk/src/mainboard/supermicro/x6dhr_ig2/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/supermicro/x6dhr_ig2/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -36,7 +36,7 @@
 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

Modified: trunk/src/mainboard/technexion/tim5690/cmos.layout
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/technexion/tim5690/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/technexion/tim8690/cmos.layout
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/technexion/tim8690/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,14 +53,14 @@
 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

Modified: trunk/src/mainboard/technologic/ts5300/cmos.layout
==============================================================================
--- trunk/src/mainboard/technologic/ts5300/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/technologic/ts5300/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/tyan/s2735/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2735/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2735/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -38,7 +38,7 @@
 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

Modified: trunk/src/mainboard/tyan/s2850/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2850/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2850/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2875/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2875/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2875/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2880/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2880/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2880/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2881/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2881/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2881/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2882/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2882/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2882/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2885/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2885/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2885/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2891/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2891/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2891/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2892/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2892/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2892/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2895/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2895/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2895/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s2912/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2912/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2912/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,7 +53,7 @@
 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

Modified: trunk/src/mainboard/tyan/s2912_fam10/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s2912_fam10/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -53,7 +53,7 @@
 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

Modified: trunk/src/mainboard/tyan/s4880/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s4880/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s4880/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/tyan/s4882/cmos.layout
==============================================================================
--- trunk/src/mainboard/tyan/s4882/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/tyan/s4882/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -32,14 +32,14 @@
 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

Modified: trunk/src/mainboard/via/epia-cn/cmos.layout
==============================================================================
--- trunk/src/mainboard/via/epia-cn/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/via/epia-cn/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/via/epia-m/cmos.layout
==============================================================================
--- trunk/src/mainboard/via/epia-m/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/via/epia-m/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/via/epia-m700/cmos.layout
==============================================================================
--- trunk/src/mainboard/via/epia-m700/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/via/epia-m700/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/via/epia-n/cmos.layout
==============================================================================
--- trunk/src/mainboard/via/epia-n/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/via/epia-n/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/via/epia/cmos.layout
==============================================================================
--- trunk/src/mainboard/via/epia/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/via/epia/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/mainboard/winent/pl6064/cmos.layout
==============================================================================
--- trunk/src/mainboard/winent/pl6064/cmos.layout	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/mainboard/winent/pl6064/cmos.layout	Thu Apr  8 17:06:44 2010	(r5380)
@@ -35,7 +35,7 @@
 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

Modified: trunk/src/northbridge/amd/amdfam10/northbridge.c
==============================================================================
--- trunk/src/northbridge/amd/amdfam10/northbridge.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/northbridge/amd/amdfam10/northbridge.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -1234,7 +1234,7 @@
 
 	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

Modified: trunk/src/northbridge/amd/amdk8/coherent_ht.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/coherent_ht.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/northbridge/amd/amdk8/coherent_ht.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -1595,7 +1595,7 @@
 	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 {

Modified: trunk/src/northbridge/amd/amdk8/northbridge.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/northbridge.c	Thu Apr  8 17:02:39 2010	(r5379)
+++ trunk/src/northbridge/amd/amdk8/northbridge.c	Thu Apr  8 17:06:44 2010	(r5380)
@@ -1142,7 +1142,7 @@
 
 	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)




More information about the coreboot mailing list