Author: oxygene Date: Wed May 5 15:12:42 2010 New Revision: 5525 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5525
Log: Rename "apic" and "apic_cluster" to "lapic" and "lapic_cluster" in device trees. Adapt sconfig as necessary.
Signed-off-by: Patrick Georgi patrick.georgi@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de Acked-by: Peter Stuge peter@stuge.se
Modified: trunk/src/mainboard/a-trend/atc-6220/devicetree.cb trunk/src/mainboard/a-trend/atc-6240/devicetree.cb trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb trunk/src/mainboard/amd/db800/devicetree.cb trunk/src/mainboard/amd/dbm690t/devicetree.cb trunk/src/mainboard/amd/mahogany/devicetree.cb trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb trunk/src/mainboard/amd/norwich/devicetree.cb trunk/src/mainboard/amd/pistachio/devicetree.cb trunk/src/mainboard/amd/rumba/devicetree.cb trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb trunk/src/mainboard/arima/hdama/devicetree.cb trunk/src/mainboard/artecgroup/dbe61/devicetree.cb trunk/src/mainboard/asrock/939a785gmh/devicetree.cb trunk/src/mainboard/asus/a8n_e/devicetree.cb trunk/src/mainboard/asus/a8v-e_se/devicetree.cb trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb trunk/src/mainboard/asus/mew-am/devicetree.cb trunk/src/mainboard/asus/p2b-d/devicetree.cb trunk/src/mainboard/asus/p2b-ds/devicetree.cb trunk/src/mainboard/asus/p2b-f/devicetree.cb trunk/src/mainboard/asus/p2b-ls/devicetree.cb trunk/src/mainboard/asus/p2b/devicetree.cb trunk/src/mainboard/asus/p3b-f/devicetree.cb trunk/src/mainboard/azza/pt-6ibd/devicetree.cb trunk/src/mainboard/bcom/winnetp680/devicetree.cb trunk/src/mainboard/biostar/m6tba/devicetree.cb trunk/src/mainboard/broadcom/blast/devicetree.cb trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb trunk/src/mainboard/dell/s1850/devicetree.cb trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb trunk/src/mainboard/digitallogic/msm800sev/devicetree.cb trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb trunk/src/mainboard/gigabyte/m57sli/devicetree.cb trunk/src/mainboard/hp/dl145_g3/devicetree.cb trunk/src/mainboard/hp/e_vectra_p2706t/devicetree.cb trunk/src/mainboard/ibm/e325/devicetree.cb trunk/src/mainboard/ibm/e326/devicetree.cb trunk/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb trunk/src/mainboard/intel/d945gclf/devicetree.cb trunk/src/mainboard/intel/eagleheights/devicetree.cb trunk/src/mainboard/intel/jarrell/devicetree.cb trunk/src/mainboard/intel/mtarvon/devicetree.cb trunk/src/mainboard/intel/truxton/devicetree.cb trunk/src/mainboard/intel/xe7501devkit/devicetree.cb trunk/src/mainboard/iwill/dk8_htx/devicetree.cb trunk/src/mainboard/iwill/dk8s2/devicetree.cb trunk/src/mainboard/iwill/dk8x/devicetree.cb trunk/src/mainboard/jetway/j7f24/devicetree.cb trunk/src/mainboard/kontron/986lcd-m/devicetree.cb trunk/src/mainboard/kontron/kt690/devicetree.cb trunk/src/mainboard/lippert/roadrunner-lx/devicetree.cb trunk/src/mainboard/lippert/spacerunner-lx/devicetree.cb trunk/src/mainboard/mitac/6513wu/devicetree.cb trunk/src/mainboard/msi/ms6119/devicetree.cb trunk/src/mainboard/msi/ms6147/devicetree.cb trunk/src/mainboard/msi/ms6156/devicetree.cb trunk/src/mainboard/msi/ms6178/devicetree.cb trunk/src/mainboard/msi/ms7135/devicetree.cb trunk/src/mainboard/msi/ms7260/devicetree.cb trunk/src/mainboard/msi/ms9185/devicetree.cb trunk/src/mainboard/msi/ms9282/devicetree.cb trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb trunk/src/mainboard/nec/powermate2000/devicetree.cb trunk/src/mainboard/newisys/khepri/devicetree.cb trunk/src/mainboard/nokia/ip530/devicetree.cb trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb trunk/src/mainboard/olpc/btest/devicetree.cb trunk/src/mainboard/olpc/rev_a/devicetree.cb trunk/src/mainboard/pcengines/alix1c/devicetree.cb trunk/src/mainboard/rca/rm4100/devicetree.cb trunk/src/mainboard/roda/rk886ex/devicetree.cb trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb trunk/src/mainboard/sunw/ultra40/devicetree.cb trunk/src/mainboard/supermicro/h8dme/devicetree.cb trunk/src/mainboard/supermicro/h8dmr/devicetree.cb trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb trunk/src/mainboard/technexion/tim5690/devicetree.cb trunk/src/mainboard/technexion/tim8690/devicetree.cb trunk/src/mainboard/thomson/ip1000/devicetree.cb trunk/src/mainboard/tyan/s1846/devicetree.cb trunk/src/mainboard/tyan/s2735/devicetree.cb trunk/src/mainboard/tyan/s2850/devicetree.cb trunk/src/mainboard/tyan/s2875/devicetree.cb trunk/src/mainboard/tyan/s2880/devicetree.cb trunk/src/mainboard/tyan/s2881/devicetree.cb trunk/src/mainboard/tyan/s2882/devicetree.cb trunk/src/mainboard/tyan/s2885/devicetree.cb trunk/src/mainboard/tyan/s2891/devicetree.cb trunk/src/mainboard/tyan/s2892/devicetree.cb trunk/src/mainboard/tyan/s2895/devicetree.cb trunk/src/mainboard/tyan/s2912/devicetree.cb trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb trunk/src/mainboard/tyan/s4880/devicetree.cb trunk/src/mainboard/tyan/s4882/devicetree.cb trunk/src/mainboard/via/epia-cn/devicetree.cb trunk/src/mainboard/via/epia-m/devicetree.cb trunk/src/mainboard/via/epia-m700/devicetree.cb trunk/src/mainboard/via/epia-n/devicetree.cb trunk/src/mainboard/via/epia/devicetree.cb trunk/src/mainboard/via/pc2500e/devicetree.cb trunk/src/mainboard/via/vt8454c/devicetree.cb trunk/src/mainboard/winent/pl6064/devicetree.cb trunk/util/sconfig/lex.yy.c_shipped trunk/util/sconfig/sconfig.l
Modified: trunk/src/mainboard/a-trend/atc-6220/devicetree.cb ============================================================================== --- trunk/src/mainboard/a-trend/atc-6220/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/a-trend/atc-6220/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/a-trend/atc-6240/devicetree.cb ============================================================================== --- trunk/src/mainboard/a-trend/atc-6240/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/a-trend/atc-6240/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb ============================================================================== --- trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/amd/db800/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/db800/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/db800/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -59,9 +59,9 @@ end end # APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/amd/dbm690t/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/dbm690t/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/dbm690t/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -9,9 +9,9 @@ #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16 chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_S1G1 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/amd/mahogany/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/mahogany/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/mahogany/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -9,9 +9,9 @@ #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16 chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_AM2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/mahogany_fam10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,8 +1,8 @@ # sample config for amd/mahogany_fam10 chip northbridge/amd/amdfam10/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_AM2r2 #L1 and DDR2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/amd/norwich/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/norwich/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/norwich/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -32,9 +32,9 @@ end end # APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/amd/pistachio/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/pistachio/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/pistachio/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -9,9 +9,9 @@ #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16 chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_AM2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/amd/rumba/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/rumba/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/rumba/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,9 +1,9 @@ chip northbridge/amd/gx2 register "setupflash" = "0" #register "irqmap" = "0xaa5b" - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_gx2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/serengeti_cheetah/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdfam10/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F_1207 #L1 and DDR2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/amd/tilapia_fam10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,8 +1,8 @@ # sample config for amd/tilapia_fam10 chip northbridge/amd/amdfam10/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR3 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/arima/hdama/devicetree.cb ============================================================================== --- trunk/src/mainboard/arima/hdama/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/arima/hdama/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/artecgroup/dbe61/devicetree.cb ============================================================================== --- trunk/src/mainboard/artecgroup/dbe61/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/artecgroup/dbe61/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -32,9 +32,9 @@ end end # APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/asrock/939a785gmh/devicetree.cb ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asrock/939a785gmh/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -9,9 +9,9 @@ #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16 chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_939 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/asus/a8n_e/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/a8n_e/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/a8n_e/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/amd/socket_939 # Socket 939 CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end
Modified: trunk/src/mainboard/asus/a8v-e_se/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/a8v-e_se/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/amd/socket_939 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/m2v-mx_se/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/amd/socket_AM2 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/mew-am/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/mew-am/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/mew-am/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i82810 # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/p2b-d/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/p2b-d/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/p2b-d/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,10 +1,10 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end chip cpu/intel/slot_1 # CPU - device apic 1 on end # APIC + device lapic 1 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/p2b-ds/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/p2b-ds/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/p2b-ds/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,10 +1,10 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end chip cpu/intel/slot_1 # CPU - device apic 1 on end # APIC + device lapic 1 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/p2b-f/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/p2b-f/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/p2b-f/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/p2b-ls/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/p2b-ls/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/p2b-ls/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/p2b/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/p2b/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/p2b/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/asus/p3b-f/devicetree.cb ============================================================================== --- trunk/src/mainboard/asus/p3b-f/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/asus/p3b-f/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/azza/pt-6ibd/devicetree.cb ============================================================================== --- trunk/src/mainboard/azza/pt-6ibd/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/azza/pt-6ibd/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/bcom/winnetp680/devicetree.cb ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/bcom/winnetp680/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -56,9 +56,9 @@ device pci 12.0 on end # Ethernet end end - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/via/model_c7 # VIA C7 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end end
Modified: trunk/src/mainboard/biostar/m6tba/devicetree.cb ============================================================================== --- trunk/src/mainboard/biostar/m6tba/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/biostar/m6tba/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/broadcom/blast/devicetree.cb ============================================================================== --- trunk/src/mainboard/broadcom/blast/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/broadcom/blast/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb ============================================================================== --- trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/dell/s1850/devicetree.cb ============================================================================== --- trunk/src/mainboard/dell/s1850/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/dell/s1850/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -58,12 +58,12 @@ device pci 04.0 on end device pci 06.0 on end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu 0 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 # cpu 1 - device apic 6 on end + device lapic 6 on end end end register "intrline" = "0x00070100"
Modified: trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -51,9 +51,9 @@ end end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA479M - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/digitallogic/msm800sev/devicetree.cb ============================================================================== --- trunk/src/mainboard/digitallogic/msm800sev/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/digitallogic/msm800sev/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -76,9 +76,9 @@ end
# APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_AM2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/gigabyte/m57sli/devicetree.cb ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/gigabyte/m57sli/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_AM2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/hp/dl145_g3/devicetree.cb ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/hp/dl145_g3/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/hp/e_vectra_p2706t/devicetree.cb ============================================================================== --- trunk/src/mainboard/hp/e_vectra_p2706t/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/hp/e_vectra_p2706t/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,8 +1,8 @@ # TODO: i810E actually! chip northbridge/intel/i82810 # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on
Modified: trunk/src/mainboard/ibm/e325/devicetree.cb ============================================================================== --- trunk/src/mainboard/ibm/e325/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/ibm/e325/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -69,12 +69,12 @@ device pci 19.3 on end end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end chip cpu/amd/socket_940 - device apic 1 on end + device lapic 1 on end end end end
Modified: trunk/src/mainboard/ibm/e326/devicetree.cb ============================================================================== --- trunk/src/mainboard/ibm/e326/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/ibm/e326/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb ============================================================================== --- trunk/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -67,9 +67,9 @@ end end # APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/intel/d945gclf/devicetree.cb ============================================================================== --- trunk/src/mainboard/intel/d945gclf/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/intel/d945gclf/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -19,9 +19,9 @@
chip northbridge/intel/i945
- device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_441 - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/intel/eagleheights/devicetree.cb ============================================================================== --- trunk/src/mainboard/intel/eagleheights/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/intel/eagleheights/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -64,9 +64,9 @@ device pci 1f.4 on end # Performance counters end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/bga956 - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/intel/jarrell/devicetree.cb ============================================================================== --- trunk/src/mainboard/intel/jarrell/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/intel/jarrell/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -68,12 +68,12 @@ register "gpio[41]" = "ICH5R_GPIO_USE_AS_GPIO | ICH5R_GPIO_SEL_INPUT" end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu 0 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 # cpu 1 - device apic 6 on end + device lapic 6 on end end end end
Modified: trunk/src/mainboard/intel/mtarvon/devicetree.cb ============================================================================== --- trunk/src/mainboard/intel/mtarvon/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/intel/mtarvon/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -36,9 +36,9 @@ device pci 1f.3 on end # SMBus end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA479M - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/intel/truxton/devicetree.cb ============================================================================== --- trunk/src/mainboard/intel/truxton/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/intel/truxton/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -46,9 +46,9 @@ device pci 1f.4 on end # ? end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/ep80579 - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/intel/xe7501devkit/devicetree.cb ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/intel/xe7501devkit/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -61,12 +61,12 @@ device pci 1f.6 off end # AC97 Modem end # SB end # PCI_DOMAIN - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 - device apic 6 on end + device lapic 6 on end end end end
Modified: trunk/src/mainboard/iwill/dk8_htx/devicetree.cb ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/iwill/dk8_htx/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/iwill/dk8s2/devicetree.cb ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/iwill/dk8s2/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -77,12 +77,12 @@ device pci 19.3 on end end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end chip cpu/amd/socket_940 - device apic 1 on end + device lapic 1 on end end end end
Modified: trunk/src/mainboard/iwill/dk8x/devicetree.cb ============================================================================== --- trunk/src/mainboard/iwill/dk8x/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/iwill/dk8x/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -56,12 +56,12 @@ device pci 19.3 on end end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end chip cpu/amd/socket_940 - device apic 1 on end + device lapic 1 on end end end end
Modified: trunk/src/mainboard/jetway/j7f24/devicetree.cb ============================================================================== --- trunk/src/mainboard/jetway/j7f24/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/jetway/j7f24/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -54,9 +54,9 @@ device pci 12.0 on end # Ethernet end end - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/via/model_c7 # VIA C7 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end end
Modified: trunk/src/mainboard/kontron/986lcd-m/devicetree.cb ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/kontron/986lcd-m/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,8 +1,8 @@ chip northbridge/intel/i945
- device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mFCPGA478 - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/kontron/kt690/devicetree.cb ============================================================================== --- trunk/src/mainboard/kontron/kt690/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/kontron/kt690/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -9,9 +9,9 @@ #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16 chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_S1G1 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/lippert/roadrunner-lx/devicetree.cb ============================================================================== --- trunk/src/mainboard/lippert/roadrunner-lx/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/lippert/roadrunner-lx/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -81,9 +81,9 @@ end end # APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/lippert/spacerunner-lx/devicetree.cb ============================================================================== --- trunk/src/mainboard/lippert/spacerunner-lx/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/lippert/spacerunner-lx/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -82,9 +82,9 @@ end end # APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/mitac/6513wu/devicetree.cb ============================================================================== --- trunk/src/mainboard/mitac/6513wu/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/mitac/6513wu/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -19,9 +19,9 @@ ##
chip northbridge/intel/i82810 # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/msi/ms6119/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms6119/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms6119/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/msi/ms6147/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms6147/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms6147/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/msi/ms6156/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms6156/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms6156/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -19,9 +19,9 @@ ##
chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/msi/ms6178/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms6178/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms6178/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -19,9 +19,9 @@ ##
chip northbridge/intel/i82810 # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on
Modified: trunk/src/mainboard/msi/ms7135/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms7135/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms7135/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/amd/socket_754 # Socket 754 CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end
Modified: trunk/src/mainboard/msi/ms7260/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms7260/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms7260/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/amd/socket_AM2 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/msi/ms9185/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms9185/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms9185/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/msi/ms9282/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms9282/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms9282/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/msi/ms9652_fam10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -22,9 +22,9 @@ ##
chip northbridge/amd/amdfam10/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F_1207 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/nec/powermate2000/devicetree.cb ============================================================================== --- trunk/src/mainboard/nec/powermate2000/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/nec/powermate2000/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i82810 # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on
Modified: trunk/src/mainboard/newisys/khepri/devicetree.cb ============================================================================== --- trunk/src/mainboard/newisys/khepri/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/newisys/khepri/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,10 +1,10 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end chip cpu/amd/socket_940 - device apic 1 on end + device lapic 1 on end end end
Modified: trunk/src/mainboard/nokia/ip530/devicetree.cb ============================================================================== --- trunk/src/mainboard/nokia/ip530/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/nokia/ip530/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -19,9 +19,9 @@ ##
chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/nvidia/l1_2pvv/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/olpc/btest/devicetree.cb ============================================================================== --- trunk/src/mainboard/olpc/btest/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/olpc/btest/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,9 +1,9 @@ chip northbridge/amd/gx2 register "irqmap" = "0xaa5b" register "setupflash" = "0" - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_gx2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/olpc/rev_a/devicetree.cb ============================================================================== --- trunk/src/mainboard/olpc/rev_a/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/olpc/rev_a/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,9 +1,9 @@ chip northbridge/amd/gx2 register "irqmap" = "0xaa5b" register "setupflash" = "0" - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_gx2 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/pcengines/alix1c/devicetree.cb ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/pcengines/alix1c/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -76,9 +76,9 @@ end
# APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/rca/rm4100/devicetree.cb ============================================================================== --- trunk/src/mainboard/rca/rm4100/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/rca/rm4100/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i82830 # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_mFCBGA479 # Mobile Celeron Micro-FCBGA Socket 479 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/roda/rk886ex/devicetree.cb ============================================================================== --- trunk/src/mainboard/roda/rk886ex/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/roda/rk886ex/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -21,9 +21,9 @@
chip northbridge/intel/i945
- device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mFCPGA478 - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb ============================================================================== --- trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -19,9 +19,9 @@ ##
chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/sunw/ultra40/devicetree.cb ============================================================================== --- trunk/src/mainboard/sunw/ultra40/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/sunw/ultra40/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/supermicro/h8dme/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/h8dme/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/supermicro/h8dmr/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/h8dmr/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdfam10/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F_1207 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/h8qme_fam10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdfam10/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F_1207 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/x6dai_g/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -52,12 +52,12 @@ device pci 04.0 on end device pci 08.0 on end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu0 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 # cpu1 - device apic 6 on end + device lapic 6 on end end end end
Modified: trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/x6dhe_g/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -75,12 +75,12 @@ device pci 06.0 on end end
- device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 # CPU 0 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 # CPU 1 - device apic 6 on end + device lapic 6 on end end end end
Modified: trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/x6dhe_g2/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -75,12 +75,12 @@ device pci 06.0 on end end
- device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 # CPU 0 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 # CPU 1 - device apic 6 on end + device lapic 6 on end end end end
Modified: trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/x6dhr_ig/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -71,12 +71,12 @@ end device pci 06.0 on end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu 0 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 # cpu 1 - device apic 6 on end + device lapic 6 on end end end register "intrline" = "0x00070105"
Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -62,12 +62,12 @@ device pci 04.0 on end device pci 06.0 on end end - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu 0 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 # cpu 1 - device apic 6 on end + device lapic 6 on end end end register "intrline" = "0x00070105"
Modified: trunk/src/mainboard/technexion/tim5690/devicetree.cb ============================================================================== --- trunk/src/mainboard/technexion/tim5690/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/technexion/tim5690/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -9,9 +9,9 @@ #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16 chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_S1G1 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/technexion/tim8690/devicetree.cb ============================================================================== --- trunk/src/mainboard/technexion/tim8690/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/technexion/tim8690/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -9,9 +9,9 @@ #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16 chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_S1G1 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/thomson/ip1000/devicetree.cb ============================================================================== --- trunk/src/mainboard/thomson/ip1000/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/thomson/ip1000/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i82830 # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/socket_mFCBGA479 # Low Voltage PIII Micro-FCBGA Socket 479 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end
Modified: trunk/src/mainboard/tyan/s1846/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s1846/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s1846/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/intel/i440bx # Northbridge - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU - device apic 0 on end # APIC + device lapic 0 on end # APIC end end device pci_domain 0 on # PCI domain
Modified: trunk/src/mainboard/tyan/s2735/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2735/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2735/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -73,12 +73,12 @@ device pci 1f.6 off end end # SB end # PCI_DOMAIN - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/intel/socket_mPGA604 - device apic 0 on end + device lapic 0 on end end chip cpu/intel/socket_mPGA604 - device apic 6 on end + device lapic 6 on end end end end
Modified: trunk/src/mainboard/tyan/s2850/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2850/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2850/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2875/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2875/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2875/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2880/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2880/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2880/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2881/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2881/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2881/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2882/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2882/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2882/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/tyan/s2885/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2885/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2885/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2891/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2891/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2891/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2892/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2892/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2892/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2895/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2895/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2895/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2912/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2912/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2912/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s2912_fam10/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdfam10/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_F_1207 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/tyan/s4880/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s4880/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s4880/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/tyan/s4882/devicetree.cb ============================================================================== --- trunk/src/mainboard/tyan/s4882/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/tyan/s4882/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/socket_940 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/via/epia-cn/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/epia-cn/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/via/epia-cn/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -53,9 +53,9 @@ device pci 12.0 on end # Ethernet end end - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/via/model_c7 # VIA C7 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end end
Modified: trunk/src/mainboard/via/epia-m/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/epia-m/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/via/epia-m/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,8 +1,8 @@ chip northbridge/via/vt8623
- device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/via/model_c3 - device apic 0 on end + device lapic 0 on end end end
Modified: trunk/src/mainboard/via/epia-m700/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/epia-m700/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/via/epia-m700/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -16,9 +16,9 @@ # device pci 11.0 on # Southbridge LPC # end end - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/via/model_c7 # VIA C7 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end end
Modified: trunk/src/mainboard/via/epia-n/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/epia-n/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/via/epia-n/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -21,9 +21,9 @@
chip northbridge/via/cn400 # Northbridge
- device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/via/model_c3 # VIA C3 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end
Modified: trunk/src/mainboard/via/epia/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/epia/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/via/epia/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -54,9 +54,9 @@ end end
- device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/via/model_c3 - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/src/mainboard/via/pc2500e/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/pc2500e/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/via/pc2500e/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -80,9 +80,9 @@ device pci 12.0 on end # Ethernet end end - device apic_cluster 0 on # APIC cluster + device lapic_cluster 0 on # APIC cluster chip cpu/via/model_c7 # VIA C7 - device apic 0 on end # APIC + device lapic 0 on end # APIC end end end
Modified: trunk/src/mainboard/via/vt8454c/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/vt8454c/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/via/vt8454c/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -1,7 +1,7 @@ chip northbridge/via/cx700 - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/via/model_c7 - device apic 0 on end + device lapic 0 on end end end device pci_domain 0 on
Modified: trunk/src/mainboard/winent/pl6064/devicetree.cb ============================================================================== --- trunk/src/mainboard/winent/pl6064/devicetree.cb Wed May 5 14:05:25 2010 (r5524) +++ trunk/src/mainboard/winent/pl6064/devicetree.cb Wed May 5 15:12:42 2010 (r5525) @@ -72,9 +72,9 @@ end end # APIC cluster is late CPU init. - device apic_cluster 0 on + device lapic_cluster 0 on chip cpu/amd/model_lx - device apic 0 on end + device lapic 0 on end end end end
Modified: trunk/util/sconfig/lex.yy.c_shipped ============================================================================== --- trunk/util/sconfig/lex.yy.c_shipped Wed May 5 14:05:25 2010 (r5524) +++ trunk/util/sconfig/lex.yy.c_shipped Wed May 5 15:12:42 2010 (r5525) @@ -33,7 +33,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -50,10 +50,9 @@ typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */
/* Limits of integral types. */ #ifndef INT8_MIN @@ -84,6 +83,8 @@ #define UINT32_MAX (4294967295U) #endif
+#endif /* ! C99 */ + #endif /* ! FLEXINT_H */
#ifdef __cplusplus @@ -140,7 +141,15 @@
/* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif
/* The state buf must be large enough to hold one state per character in the main buffer. @@ -161,7 +170,7 @@ #define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -223,7 +232,7 @@
int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -368,17 +377,17 @@ flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[86] = +static yyconst flex_int16_t yy_accept[87] = { 0, 0, 0, 26, 24, 1, 3, 24, 24, 24, 21, - 21, 19, 22, 22, 22, 22, 22, 24, 24, 24, + 21, 19, 22, 22, 22, 22, 24, 24, 24, 24, 24, 24, 1, 3, 24, 0, 24, 0, 2, 21, - 22, 24, 24, 24, 22, 24, 24, 24, 17, 24, + 22, 24, 24, 22, 24, 24, 24, 17, 24, 24, 24, 7, 24, 24, 24, 23, 23, 20, 24, 24, - 24, 16, 18, 11, 15, 8, 9, 10, 24, 12, - 4, 24, 24, 24, 24, 24, 24, 24, 24, 5, + 16, 18, 11, 15, 24, 8, 9, 10, 24, 4, + 24, 24, 24, 24, 24, 12, 24, 24, 5, 24, 24, 24, 24, 24, 24, 24, 24, 6, 24, 24, - 24, 14, 24, 13, 0 + 24, 14, 24, 24, 13, 0 } ;
static yyconst flex_int32_t yy_ec[256] = @@ -421,76 +430,80 @@ 1, 1 } ;
-static yyconst flex_int16_t yy_base[91] = +static yyconst flex_int16_t yy_base[92] = { 0, - 0, 0, 146, 0, 143, 147, 141, 31, 35, 32, - 111, 0, 43, 46, 49, 65, 52, 53, 46, 21, - 126, 0, 139, 147, 62, 135, 76, 136, 147, 0, - 75, 86, 118, 117, 78, 110, 120, 120, 0, 107, - 115, 0, 111, 105, 111, 0, 147, 0, 114, 102, - 106, 0, 0, 0, 0, 0, 113, 0, 104, 111, - 0, 108, 106, 92, 105, 102, 84, 78, 85, 0, - 83, 88, 68, 83, 64, 62, 69, 0, 59, 53, - 54, 0, 39, 0, 147, 41, 109, 111, 113, 115 + 0, 0, 144, 0, 141, 145, 139, 31, 35, 32, + 109, 0, 43, 46, 59, 49, 35, 127, 46, 47, + 123, 0, 136, 145, 71, 132, 75, 133, 145, 0, + 72, 80, 115, 75, 108, 118, 118, 0, 105, 105, + 112, 0, 108, 102, 108, 0, 145, 0, 100, 104, + 0, 0, 0, 0, 103, 0, 110, 0, 101, 0, + 106, 105, 103, 89, 100, 103, 81, 75, 0, 89, + 80, 85, 79, 86, 71, 62, 70, 0, 57, 48, + 35, 0, 44, 15, 0, 145, 34, 106, 108, 110, + 112 + } ;
-static yyconst flex_int16_t yy_def[91] = +static yyconst flex_int16_t yy_def[92] = { 0, - 85, 1, 85, 86, 85, 85, 86, 87, 88, 86, - 10, 86, 10, 10, 10, 10, 10, 86, 86, 86, - 86, 86, 85, 85, 87, 89, 88, 90, 85, 10, - 10, 10, 86, 86, 10, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 85, 32, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 0, 85, 85, 85, 85, 85 + 86, 1, 86, 87, 86, 86, 87, 88, 89, 87, + 10, 87, 10, 10, 10, 10, 87, 87, 87, 87, + 87, 87, 86, 86, 88, 90, 89, 91, 86, 10, + 10, 10, 87, 10, 87, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 87, 86, 32, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 0, 86, 86, 86, 86, + 86 + } ;
-static yyconst flex_int16_t yy_nxt[180] = +static yyconst flex_int16_t yy_nxt[178] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 10, 12, - 13, 4, 14, 15, 16, 17, 13, 4, 4, 18, - 4, 4, 4, 19, 20, 4, 21, 4, 4, 4, - 4, 4, 26, 26, 43, 22, 28, 29, 30, 30, - 30, 22, 31, 44, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 38, 41, 26, 26, 84, 46, 34, 42, 83, - 33, 31, 31, 31, 37, 82, 39, 28, 29, 40, - 35, 31, 31, 31, 31, 31, 31, 81, 80, 79, - 78, 36, 48, 48, 48, 77, 48, 76, 48, 48, - - 48, 48, 48, 75, 74, 73, 72, 71, 51, 25, - 25, 27, 27, 26, 26, 28, 28, 70, 69, 68, - 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, - 57, 56, 55, 54, 53, 52, 50, 49, 29, 47, - 23, 45, 32, 24, 23, 85, 3, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85 + 13, 4, 13, 14, 15, 16, 13, 4, 4, 17, + 18, 4, 4, 19, 20, 4, 21, 4, 4, 4, + 4, 4, 26, 26, 22, 22, 28, 29, 30, 30, + 30, 85, 31, 37, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 38, 84, + 43, 39, 41, 83, 33, 31, 31, 31, 42, 44, + 82, 36, 26, 26, 34, 46, 28, 29, 31, 31, + 31, 31, 31, 31, 81, 35, 48, 48, 48, 80, + 48, 79, 48, 48, 48, 48, 48, 78, 77, 76, + + 75, 74, 73, 72, 71, 50, 25, 25, 27, 27, + 26, 26, 28, 28, 70, 69, 68, 67, 66, 65, + 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, + 54, 53, 52, 51, 49, 29, 47, 23, 45, 40, + 32, 24, 23, 86, 3, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86 } ;
-static yyconst flex_int16_t yy_chk[180] = +static yyconst flex_int16_t yy_chk[178] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 8, 8, 20, 8, 9, 9, 10, 10, - 10, 86, 10, 20, 10, 10, 10, 10, 10, 13, - 13, 13, 14, 14, 14, 15, 15, 15, 17, 17, - 17, 18, 19, 25, 25, 83, 25, 15, 19, 81, - 14, 16, 16, 16, 17, 80, 18, 27, 27, 18, - 16, 31, 31, 31, 35, 35, 35, 79, 77, 76, - 75, 16, 32, 32, 32, 74, 32, 73, 32, 32, - - 32, 32, 32, 72, 71, 69, 68, 67, 35, 87, - 87, 88, 88, 89, 89, 90, 90, 66, 65, 64, - 63, 62, 60, 59, 57, 51, 50, 49, 45, 44, - 43, 41, 40, 38, 37, 36, 34, 33, 28, 26, - 23, 21, 11, 7, 5, 3, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85 + 1, 1, 8, 8, 87, 8, 9, 9, 10, 10, + 10, 84, 10, 17, 10, 10, 10, 10, 10, 13, + 13, 13, 14, 14, 14, 16, 16, 16, 17, 83, + 20, 17, 19, 81, 14, 15, 15, 15, 19, 20, + 80, 16, 25, 25, 15, 25, 27, 27, 31, 31, + 31, 34, 34, 34, 79, 15, 32, 32, 32, 77, + 32, 76, 32, 32, 32, 32, 32, 75, 74, 73, + + 72, 71, 70, 68, 67, 34, 88, 88, 89, 89, + 90, 90, 91, 91, 66, 65, 64, 63, 62, 61, + 59, 57, 55, 50, 49, 45, 44, 43, 41, 40, + 39, 37, 36, 35, 33, 28, 26, 23, 21, 18, + 11, 7, 5, 3, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86 } ;
static yy_state_type yy_last_accepting_state; @@ -589,7 +602,7 @@ #endif
static void yyunput (int c,char *buf_ptr ); - + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ); #endif @@ -610,7 +623,12 @@
/* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif
/* Copy whatever the last rule matched to the standard output. */ @@ -618,7 +636,7 @@ /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -629,7 +647,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -710,7 +728,7 @@ register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + if ( !(yy_init) ) { (yy_init) = 1; @@ -762,13 +780,13 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 86 ) + if ( yy_current_state >= 87 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 147 ); + while ( yy_base[yy_current_state] != 145 );
yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1172,7 +1190,7 @@ { register yy_state_type yy_current_state; register char *yy_cp; - + yy_current_state = (yy_start);
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) @@ -1186,7 +1204,7 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 86 ) + if ( yy_current_state >= 87 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1214,11 +1232,11 @@ while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 86 ) + if ( yy_current_state >= 87 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 85); + yy_is_jam = (yy_current_state == 86);
return yy_is_jam ? 0 : yy_current_state; } @@ -1226,7 +1244,7 @@ static void yyunput (int c, register char * yy_bp ) { register char *yy_cp; - + yy_cp = (yy_c_buf_p);
/* undo effects of setting up yytext */ @@ -1269,7 +1287,7 @@
{ int c; - + *(yy_c_buf_p) = (yy_hold_char);
if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) @@ -1336,12 +1354,12 @@
/** Immediately switch to a different input stream. * @param input_file A readable stream. - * + * * @note This function does not reset the start condition to @c INITIAL . */ void yyrestart (FILE * input_file ) { - + if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -1354,11 +1372,11 @@
/** Switch to a different input buffer. * @param new_buffer The new input buffer. - * + * */ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - + /* TODO. We should be able to replace this entire function body * with * yypop_buffer_state(); @@ -1398,13 +1416,13 @@ /** Allocate and initialize an input buffer state. * @param file A readable stream. * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * + * * @return the allocated buffer state. */ YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1427,11 +1445,11 @@
/** Destroy the buffer. * @param b a buffer created with yy_create_buffer() - * + * */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - + if ( ! b ) return;
@@ -1447,7 +1465,7 @@ #ifndef __cplusplus extern int isatty (int ); #endif /* __cplusplus */ - + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1456,7 +1474,7 @@
{ int oerrno = errno; - + yy_flush_buffer(b );
b->yy_input_file = file; @@ -1472,13 +1490,13 @@ }
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - + errno = oerrno; }
/** Discard all buffered characters. On the next scan, YY_INPUT will be called. * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * + * */ void yy_flush_buffer (YY_BUFFER_STATE b ) { @@ -1507,7 +1525,7 @@ * the current state. This function will allocate the stack * if necessary. * @param new_buffer The new state. - * + * */ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) { @@ -1537,7 +1555,7 @@
/** Removes and deletes the top of the stack, if present. * The next element becomes the new top. - * + * */ void yypop_buffer_state (void) { @@ -1561,7 +1579,7 @@ static void yyensure_buffer_stack (void) { int num_to_alloc; - + if (!(yy_buffer_stack)) {
/* First allocation is just for 2 elements, since we don't know if this @@ -1574,9 +1592,9 @@ ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -1604,13 +1622,13 @@ /** Setup the input buffer state to scan directly from a user-specified character buffer. * @param base the character buffer * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. + * + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -1639,22 +1657,22 @@ /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan - * + * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) { - + return yy_scan_bytes(yystr,strlen(yystr) ); }
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) @@ -1663,7 +1681,7 @@ char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; buf = (char *) yyalloc(n ); @@ -1717,16 +1735,16 @@ /* Accessor methods (get/set functions) to struct members. */
/** Get the current line number. - * + * */ int yyget_lineno (void) { - + return yylineno; }
/** Get the input stream. - * + * */ FILE *yyget_in (void) { @@ -1734,7 +1752,7 @@ }
/** Get the output stream. - * + * */ FILE *yyget_out (void) { @@ -1742,7 +1760,7 @@ }
/** Get the length of the current token. - * + * */ int yyget_leng (void) { @@ -1750,7 +1768,7 @@ }
/** Get the current token. - * + * */
char *yyget_text (void) @@ -1760,18 +1778,18 @@
/** Set the current line number. * @param line_number - * + * */ void yyset_lineno (int line_number ) { - + yylineno = line_number; }
/** Set the input stream. This does not discard the current * input buffer. * @param in_str A readable stream. - * + * * @see yy_switch_to_buffer */ void yyset_in (FILE * in_str ) @@ -1825,7 +1843,7 @@ /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy (void) { - + /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer(YY_CURRENT_BUFFER );
Modified: trunk/util/sconfig/sconfig.l ============================================================================== --- trunk/util/sconfig/sconfig.l Wed May 5 14:05:25 2010 (r5524) +++ trunk/util/sconfig/sconfig.l Wed May 5 15:12:42 2010 (r5525) @@ -36,8 +36,8 @@ pci {yylval.number=PCI; return(BUS);} pnp {yylval.number=PNP; return(BUS);} i2c {yylval.number=I2C; return(BUS);} -apic {yylval.number=APIC; return(BUS);} -apic_cluster {yylval.number=APIC_CLUSTER; return(BUS);} +lapic {yylval.number=APIC; return(BUS);} +lapic_cluster {yylval.number=APIC_CLUSTER; return(BUS);} pci_domain {yylval.number=PCI_DOMAIN; return(BUS);} irq {yylval.number=IRQ; return(RESOURCE);} drq {yylval.number=DRQ; return(RESOURCE);}