[coreboot] [v2] r4778 - in trunk/coreboot-v2/src: . arch/i386/boot arch/i386/include/arch arch/i386/smp arch/ppc/include/arch config cpu/emulation/qemu-x86 cpu/intel/speedstep mainboard mainboard/a-trend/atc-6220 mainboard/a-trend/atc-6240 mainboard/abit/be6-ii_v2_0 mainboard/advantech/pcm-5820 mainboard/amd/db800 mainboard/amd/dbm690t mainboard/amd/norwich mainboard/amd/pistachio mainboard/amd/rumba mainboard/amd/serengeti_cheetah mainboard/amd/serengeti_cheetah_fam10 mainboard/arima/hdama mainboard/artecgroup/dbe61 mainboard/asi/mb_5blgp mainboard/asi/mb_5blmp mainboard/asus/a8n_e mainboard/asus/a8v-e_se mainboard/asus/m2v-mx_se mainboard/asus/mew-am mainboard/asus/mew-vm mainboard/asus/p2b mainboard/asus/p2b-d mainboard/asus/p2b-ds mainboard/asus/p2b-f mainboard/asus/p3b-f mainboard/axus/tc320 mainboard/azza/pt-6ibd mainboard/bcom/winnet100 mainboard/bcom/winnetp680 mainboard/biostar/m6tba mainboard/broadcom/blast mainboard/compaq/deskpro_en_sff_p600 mainboard/dell/s1850 mainboard/digitallogic/adl855pc mainboard/digitallogic/msm586seg mainboard/digitallogic/msm800sev mainboard/eaglelion/5bcm mainboard/emulation/qemu-x86 mainboard/gigabyte/ga-6bxc mainboard/gigabyte/ga_2761gxdk mainboard/gigabyte/m57sli mainboard/hp/dl145_g3 mainboard/ibm/e325 mainboard/ibm/e326 mainboard/iei/juki-511p mainboard/iei/nova4899r mainboard/iei/pcisa-lx-800-r10 mainboard/intel/eagleheights mainboard/intel/jarrell mainboard/intel/mtarvon mainboard/intel/truxton mainboard/intel/xe7501devkit mainboard/iwill/dk8_htx mainboard/iwill/dk8s2 mainboard/iwill/dk8x mainboard/jetway/j7f24 mainboard/kontron/986lcd-m mainboard/kontron/kt690 mainboard/lippert/frontrunner mainboard/lippert/roadrunner-lx mainboard/lippert/spacerunner-lx mainboard/mitac/6513wu mainboard/msi/ms6119 mainboard/msi/ms6147 mainboard/msi/ms6156 mainboard/msi/ms6178 mainboard/msi/ms7135 mainboard/msi/ms7260 mainboard/msi/ms9185 mainboard/msi/ms9282 mainboard/nec/powermate2000 mainboard/newisys/khepri mainboard/nvidia/l1_2pvv mainboard/olpc/btest mainboard/olpc/rev_a mainboard/pcengines/alix1c mainboard/rca/rm4100 mainboard/soyo/sy-6ba-plus-iii mainboard/sunw/ultra40 mainboard/supermicro/h8dme mainboard/supermicro/h8dmr mainboard/supermicro/h8dmr_fam10 mainboard/supermicro/x6dai_g mainboard/supermicro/x6dhe_g mainboard/supermicro/x6dhe_g2 mainboard/supermicro/x6dhr_ig mainboard/supermicro/x6dhr_ig2 mainboard/technexion/tim5690 mainboard/technexion/tim8690 mainboard/technologic/ts5300 mainboard/televideo/tc7020 mainboard/thomson/ip1000 mainboard/tyan mainboard/tyan/s1846 mainboard/tyan/s2735 mainboard/tyan/s2850 mainboard/tyan/s2875 mainboard/tyan/s2880 mainboard/tyan/s2881 mainboard/tyan/s2882 mainboard/tyan/s2885 mainboard/tyan/s2891 mainboard/tyan/s2892 mainboard/tyan/s2895 mainboard/tyan/s2912 mainboard/tyan/s2912_fam10 mainboard/tyan/s4880 mainboard/tyan/s4882 mainboard/via/epia mainboard/via/epia-cn mainboard/via/epia-m mainboard/via/epia-m700 mainboard/via/epia-n mainboard/via/pc2500e mainboard/via/vt8454c northbridge/amd/amdfam10 northbridge/amd/amdk8 northbridge/amd/gx1 northbridge/amd/gx2 northbridge/amd/lx northbridge/intel/e7501 northbridge/intel/e7520 northbridge/intel/e7525 northbridge/intel/i3100 northbridge/intel/i440bx northbridge/intel/i82810 northbridge/intel/i82830 northbridge/intel/i855gme northbridge/intel/i855pm northbridge/intel/i945 northbridge/via/cn400 northbridge/via/cn700 northbridge/via/cx700 northbridge/via/vt8601 northbridge/via/vt8623 southbridge/amd/amd8111 southbridge/amd/cs5530 southbridge/amd/cs5536 southbridge/nvidia/ck804 southbridge/nvidia/mcp55 southbridge/via/k8t890 southbridge/via/vt8237r

svn at coreboot.org svn at coreboot.org
Thu Oct 15 15:35:48 CEST 2009


Author: myles
Date: 2009-10-15 15:35:47 +0200 (Thu, 15 Oct 2009)
New Revision: 4778

Modified:
   trunk/coreboot-v2/src/Kconfig
   trunk/coreboot-v2/src/arch/i386/boot/Config.lb
   trunk/coreboot-v2/src/arch/i386/boot/Makefile.inc
   trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c
   trunk/coreboot-v2/src/arch/i386/boot/pirq_routing.c
   trunk/coreboot-v2/src/arch/i386/boot/tables.c
   trunk/coreboot-v2/src/arch/i386/include/arch/acpi.h
   trunk/coreboot-v2/src/arch/i386/include/arch/pirq_routing.h
   trunk/coreboot-v2/src/arch/i386/smp/Config.lb
   trunk/coreboot-v2/src/arch/i386/smp/Makefile.inc
   trunk/coreboot-v2/src/arch/ppc/include/arch/pirq_routing.h
   trunk/coreboot-v2/src/config/Options.lb
   trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c
   trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc
   trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc
   trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Config.lb
   trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb
   trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Config.lb
   trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb
   trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Config.lb
   trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb
   trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Config.lb
   trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/db800/Config.lb
   trunk/coreboot-v2/src/mainboard/amd/db800/Makefile.inc
   trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb
   trunk/coreboot-v2/src/mainboard/amd/dbm690t/Kconfig
   trunk/coreboot-v2/src/mainboard/amd/dbm690t/Makefile.inc
   trunk/coreboot-v2/src/mainboard/amd/dbm690t/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c
   trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb
   trunk/coreboot-v2/src/mainboard/amd/norwich/Makefile.inc
   trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb
   trunk/coreboot-v2/src/mainboard/amd/pistachio/Kconfig
   trunk/coreboot-v2/src/mainboard/amd/pistachio/Makefile.inc
   trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/pistachio/mptable.c
   trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb
   trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Config.lb
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
   trunk/coreboot-v2/src/mainboard/arima/hdama/Config.lb
   trunk/coreboot-v2/src/mainboard/arima/hdama/Kconfig
   trunk/coreboot-v2/src/mainboard/arima/hdama/Makefile.inc
   trunk/coreboot-v2/src/mainboard/arima/hdama/Options.lb
   trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb
   trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Makefile.inc
   trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb
   trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Config.lb
   trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb
   trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Config.lb
   trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/a8n_e/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/a8n_e/Kconfig
   trunk/coreboot-v2/src/mainboard/asus/a8n_e/Makefile.inc
   trunk/coreboot-v2/src/mainboard/asus/a8n_e/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Kconfig
   trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Makefile.inc
   trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc
   trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/mew-am/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-d/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-f/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p3b-f/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb
   trunk/coreboot-v2/src/mainboard/axus/tc320/Config.lb
   trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb
   trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Config.lb
   trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb
   trunk/coreboot-v2/src/mainboard/bcom/winnet100/Config.lb
   trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb
   trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Config.lb
   trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Makefile.inc
   trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb
   trunk/coreboot-v2/src/mainboard/biostar/m6tba/Config.lb
   trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb
   trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb
   trunk/coreboot-v2/src/mainboard/broadcom/blast/Kconfig
   trunk/coreboot-v2/src/mainboard/broadcom/blast/Makefile.inc
   trunk/coreboot-v2/src/mainboard/broadcom/blast/Options.lb
   trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb
   trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
   trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb
   trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig
   trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc
   trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Options.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Config.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Makefile.inc
   trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb
   trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb
   trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Makefile.inc
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb
   trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Config.lb
   trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb
   trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
   trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
   trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
   trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
   trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb
   trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Kconfig
   trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Makefile.inc
   trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Options.lb
   trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Config.lb
   trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Kconfig
   trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Makefile.inc
   trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Options.lb
   trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb
   trunk/coreboot-v2/src/mainboard/ibm/e325/Kconfig
   trunk/coreboot-v2/src/mainboard/ibm/e325/Makefile.inc
   trunk/coreboot-v2/src/mainboard/ibm/e325/Options.lb
   trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb
   trunk/coreboot-v2/src/mainboard/ibm/e326/Kconfig
   trunk/coreboot-v2/src/mainboard/ibm/e326/Makefile.inc
   trunk/coreboot-v2/src/mainboard/ibm/e326/Options.lb
   trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb
   trunk/coreboot-v2/src/mainboard/iei/juki-511p/Kconfig
   trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb
   trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb
   trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb
   trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
   trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
   trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/jarrell/Kconfig
   trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/mtarvon/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/mtarvon/Kconfig
   trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/truxton/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/truxton/Kconfig
   trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Kconfig
   trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc
   trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb
   trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Config.lb
   trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Kconfig
   trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Makefile.inc
   trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Options.lb
   trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb
   trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Kconfig
   trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Makefile.inc
   trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Options.lb
   trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb
   trunk/coreboot-v2/src/mainboard/iwill/dk8x/Kconfig
   trunk/coreboot-v2/src/mainboard/iwill/dk8x/Makefile.inc
   trunk/coreboot-v2/src/mainboard/iwill/dk8x/Options.lb
   trunk/coreboot-v2/src/mainboard/jetway/j7f24/Config.lb
   trunk/coreboot-v2/src/mainboard/jetway/j7f24/Makefile.inc
   trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb
   trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/acpi_tables.c
   trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb
   trunk/coreboot-v2/src/mainboard/kontron/kt690/Makefile.inc
   trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb
   trunk/coreboot-v2/src/mainboard/kontron/kt690/mptable.c
   trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb
   trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb
   trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Config.lb
   trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Makefile.inc
   trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb
   trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Config.lb
   trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Makefile.inc
   trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb
   trunk/coreboot-v2/src/mainboard/mitac/6513wu/Config.lb
   trunk/coreboot-v2/src/mainboard/mitac/6513wu/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6119/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6147/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6156/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6156/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms7135/Kconfig
   trunk/coreboot-v2/src/mainboard/msi/ms7135/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms7260/Kconfig
   trunk/coreboot-v2/src/mainboard/msi/ms7260/Makefile.inc
   trunk/coreboot-v2/src/mainboard/msi/ms7260/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms9185/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig
   trunk/coreboot-v2/src/mainboard/msi/ms9185/Makefile.inc
   trunk/coreboot-v2/src/mainboard/msi/ms9185/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb
   trunk/coreboot-v2/src/mainboard/msi/ms9282/Kconfig
   trunk/coreboot-v2/src/mainboard/msi/ms9282/Makefile.inc
   trunk/coreboot-v2/src/mainboard/msi/ms9282/Options.lb
   trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb
   trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb
   trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb
   trunk/coreboot-v2/src/mainboard/newisys/khepri/Kconfig
   trunk/coreboot-v2/src/mainboard/newisys/khepri/Makefile.inc
   trunk/coreboot-v2/src/mainboard/newisys/khepri/Options.lb
   trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb
   trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Kconfig
   trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Makefile.inc
   trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Options.lb
   trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb
   trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb
   trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb
   trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb
   trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Config.lb
   trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Makefile.inc
   trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb
   trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb
   trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb
   trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb
   trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
   trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb
   trunk/coreboot-v2/src/mainboard/sunw/ultra40/Kconfig
   trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc
   trunk/coreboot-v2/src/mainboard/sunw/ultra40/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc
   trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Makefile.inc
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Kconfig
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb
   trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb
   trunk/coreboot-v2/src/mainboard/technexion/tim5690/Kconfig
   trunk/coreboot-v2/src/mainboard/technexion/tim5690/Makefile.inc
   trunk/coreboot-v2/src/mainboard/technexion/tim5690/Options.lb
   trunk/coreboot-v2/src/mainboard/technexion/tim5690/mptable.c
   trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb
   trunk/coreboot-v2/src/mainboard/technexion/tim8690/Kconfig
   trunk/coreboot-v2/src/mainboard/technexion/tim8690/Makefile.inc
   trunk/coreboot-v2/src/mainboard/technexion/tim8690/Options.lb
   trunk/coreboot-v2/src/mainboard/technexion/tim8690/mptable.c
   trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb
   trunk/coreboot-v2/src/mainboard/technologic/ts5300/Options.lb
   trunk/coreboot-v2/src/mainboard/televideo/tc7020/Config.lb
   trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb
   trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb
   trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc
   trunk/coreboot-v2/src/mainboard/tyan/s1846/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2735/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2735/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2850/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2850/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2850/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2875/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2875/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2875/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2880/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2880/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2880/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2881/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2881/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2881/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2882/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2882/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2882/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2885/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2885/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2885/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2891/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2892/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2895/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2912/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2912/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2912/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s4880/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s4880/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s4880/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s4880/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s4882/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s4882/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s4882/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s4882/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia-cn/Config.lb
   trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb
   trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia-m700/Config.lb
   trunk/coreboot-v2/src/mainboard/via/epia-m700/Kconfig
   trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia-m700/acpi_tables.c
   trunk/coreboot-v2/src/mainboard/via/epia-n/Config.lb
   trunk/coreboot-v2/src/mainboard/via/epia-n/Kconfig
   trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia-n/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia-n/acpi_tables.c
   trunk/coreboot-v2/src/mainboard/via/epia/Config.lb
   trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/epia/Options.lb
   trunk/coreboot-v2/src/mainboard/via/pc2500e/Config.lb
   trunk/coreboot-v2/src/mainboard/via/pc2500e/Kconfig
   trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb
   trunk/coreboot-v2/src/mainboard/via/vt8454c/Config.lb
   trunk/coreboot-v2/src/mainboard/via/vt8454c/Kconfig
   trunk/coreboot-v2/src/mainboard/via/vt8454c/Makefile.inc
   trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb
   trunk/coreboot-v2/src/northbridge/amd/amdfam10/Config.lb
   trunk/coreboot-v2/src/northbridge/amd/amdfam10/Makefile.inc
   trunk/coreboot-v2/src/northbridge/amd/amdfam10/northbridge.c
   trunk/coreboot-v2/src/northbridge/amd/amdk8/Config.lb
   trunk/coreboot-v2/src/northbridge/amd/amdk8/Makefile.inc
   trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c
   trunk/coreboot-v2/src/northbridge/amd/gx1/Config.lb
   trunk/coreboot-v2/src/northbridge/amd/gx1/northbridge.c
   trunk/coreboot-v2/src/northbridge/amd/gx2/Config.lb
   trunk/coreboot-v2/src/northbridge/amd/gx2/northbridge.c
   trunk/coreboot-v2/src/northbridge/amd/lx/Config.lb
   trunk/coreboot-v2/src/northbridge/amd/lx/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/e7501/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/e7501/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/e7520/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/e7520/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/e7525/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/e7525/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/i3100/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/i3100/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/i440bx/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/i440bx/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/i82810/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/i82810/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/i82830/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/i82830/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/i855gme/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/i855gme/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/i855pm/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/i855pm/northbridge.c
   trunk/coreboot-v2/src/northbridge/intel/i945/Config.lb
   trunk/coreboot-v2/src/northbridge/intel/i945/Makefile.inc
   trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c
   trunk/coreboot-v2/src/northbridge/via/cn400/Config.lb
   trunk/coreboot-v2/src/northbridge/via/cn400/northbridge.c
   trunk/coreboot-v2/src/northbridge/via/cn700/Config.lb
   trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c
   trunk/coreboot-v2/src/northbridge/via/cx700/Config.lb
   trunk/coreboot-v2/src/northbridge/via/cx700/northbridge.c
   trunk/coreboot-v2/src/northbridge/via/vt8601/Config.lb
   trunk/coreboot-v2/src/northbridge/via/vt8601/northbridge.c
   trunk/coreboot-v2/src/northbridge/via/vt8623/Config.lb
   trunk/coreboot-v2/src/northbridge/via/vt8623/northbridge.c
   trunk/coreboot-v2/src/southbridge/amd/amd8111/amd8111_acpi.c
   trunk/coreboot-v2/src/southbridge/amd/cs5530/cs5530_pirq.c
   trunk/coreboot-v2/src/southbridge/amd/cs5536/cs5536_pirq.c
   trunk/coreboot-v2/src/southbridge/nvidia/ck804/Config.lb
   trunk/coreboot-v2/src/southbridge/nvidia/ck804/Makefile.inc
   trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Config.lb
   trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Makefile.inc
   trunk/coreboot-v2/src/southbridge/nvidia/mcp55/mcp55_smbus.c
   trunk/coreboot-v2/src/southbridge/via/k8t890/k8t890_dram.c
   trunk/coreboot-v2/src/southbridge/via/vt8237r/Config.lb
   trunk/coreboot-v2/src/southbridge/via/vt8237r/Makefile.inc
Log:
Add CONFIG_GENERATE_* for tables so that the user can select which tables not
to build, but by default all the tables that are available are built.

Make PIRQ table build for qemu.

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Peter Stuge <peter at stuge.se>


Modified: trunk/coreboot-v2/src/Kconfig
===================================================================
--- trunk/coreboot-v2/src/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -237,31 +237,47 @@
 #
 # endmenu
 
+config HAVE_ACPI_TABLES
+	bool
+
+config HAVE_MP_TABLE
+	bool
+
+config HAVE_PIRQ_TABLE
+	bool
+
+config HAVE_HIGH_TABLES
+	bool
+
 menu "System tables"
 
 config HAVE_LOW_TABLES
 	bool
 	default y
 
-config HAVE_HIGH_TABLES
+config WRITE_HIGH_TABLES
 	bool "Write 'high' tables to avoid being overwritten in F segment"
+	depends on HAVE_HIGH_TABLES
 	default y
 
 config MULTIBOOT
 	bool "Generate Multiboot tables (for GRUB2)"
 	default n
 
-config HAVE_ACPI_TABLES
+config GENERATE_ACPI_TABLES
+	depends on HAVE_ACPI_TABLES
 	bool "Generate ACPI tables"
-	default n
+	default y
 
-config HAVE_MP_TABLE
+config GENERATE_MP_TABLE
+	depends on HAVE_MP_TABLE
 	bool "Generate an MP table"
-	default n
+	default y
 
-config HAVE_PIRQ_TABLE
+config GENERATE_PIRQ_TABLE
+	depends on HAVE_PIRQ_TABLE
 	bool "Generate a PIRQ table"
-	default n
+	default y
 
 endmenu
 

Modified: trunk/coreboot-v2/src/arch/i386/boot/Config.lb
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/boot/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_MULTIBOOT
 uses CONFIG_HAVE_ACPI_RESUME
 
@@ -9,10 +9,10 @@
 object multiboot.o
 end
 object tables.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 object pirq_routing.o 
 end
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 object acpi.o
 object acpigen.o
 if CONFIG_HAVE_ACPI_RESUME

Modified: trunk/coreboot-v2/src/arch/i386/boot/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/boot/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -2,8 +2,8 @@
 obj-y += coreboot_table.o
 obj-$(CONFIG_MULTIBOOT) += multiboot.o
 obj-y += tables.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += pirq_routing.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpigen.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.o
 obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S
 

Modified: trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -436,7 +436,7 @@
 	return mem;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 extern uint64_t high_tables_base, high_tables_size;
 #endif
 
@@ -447,7 +447,7 @@
 	struct lb_header *head;
 	struct lb_memory *mem;
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 	printk_debug("Writing high table forward entry at 0x%08lx\n",
 			low_table_end);
 	head = lb_table_init(low_table_end);
@@ -505,7 +505,7 @@
 	lb_add_memory_range(mem, LB_MEM_TABLE,
 		rom_table_start, rom_table_end-rom_table_start);
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 	printk_debug("Adding high table area\n");
 	// should this be LB_MEM_ACPI?
 	lb_add_memory_range(mem, LB_MEM_TABLE,

Modified: trunk/coreboot-v2/src/arch/i386/boot/pirq_routing.c
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/pirq_routing.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/boot/pirq_routing.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <device/pci.h>
 
-#if (CONFIG_DEBUG==1 && CONFIG_HAVE_PIRQ_TABLE==1)
+#if (CONFIG_DEBUG==1 && CONFIG_GENERATE_PIRQ_TABLE==1)
 static void check_pirq_routing_table(struct irq_routing_table *rt)
 {
 	uint8_t *addr = (uint8_t *)rt;
@@ -83,7 +83,7 @@
 #define verify_copy_pirq_routing_table(addr)
 #endif
 
-#if CONFIG_HAVE_PIRQ_TABLE==1
+#if CONFIG_GENERATE_PIRQ_TABLE==1
 unsigned long copy_pirq_routing_table(unsigned long addr)
 {
 	/* Align the table to be 16 byte aligned. */
@@ -100,7 +100,7 @@
 }
 #endif
 
-#if (CONFIG_PIRQ_ROUTE==1 && CONFIG_HAVE_PIRQ_TABLE==1)
+#if (CONFIG_PIRQ_ROUTE==1 && CONFIG_GENERATE_PIRQ_TABLE==1)
 void pirq_routing_irqs(unsigned long addr)
 {
 	int i, j, k, num_entries;

Modified: trunk/coreboot-v2/src/arch/i386/boot/tables.c
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/tables.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/boot/tables.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -104,7 +104,7 @@
 	post_code(0x9a);
 
 	/* Write ACPI tables to F segment and high tables area */
-#if CONFIG_HAVE_ACPI_TABLES == 1
+#if CONFIG_GENERATE_ACPI_TABLES == 1
 	if (high_tables_base) {
 		unsigned long acpi_start = high_table_end;
 		rom_table_end = ALIGN(rom_table_end, 16);
@@ -134,7 +134,7 @@
 #endif
 	post_code(0x9b);
 
-#if CONFIG_HAVE_MP_TABLE == 1
+#if CONFIG_GENERATE_MP_TABLE == 1
 	/* The smp table must be in 0-1K, 639K-640K, or 960K-1M */
 	rom_table_end = write_smp_table(rom_table_end);
 	rom_table_end = ALIGN(rom_table_end, 1024);
@@ -144,7 +144,7 @@
 		high_table_end = write_smp_table(high_table_end);
 		high_table_end = ALIGN(high_table_end, 1024);
 	}
-#endif /* CONFIG_HAVE_MP_TABLE */
+#endif /* CONFIG_GENERATE_MP_TABLE */
 
 	post_code(0x9c);
 

Modified: trunk/coreboot-v2/src/arch/i386/include/arch/acpi.h
===================================================================
--- trunk/coreboot-v2/src/arch/i386/include/arch/acpi.h	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/include/arch/acpi.h	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 #ifndef __ASM_ACPI_H
 #define __ASM_ACPI_H
 
-#if CONFIG_HAVE_ACPI_TABLES==1
+#if CONFIG_GENERATE_ACPI_TABLES==1
 
 #include <stdint.h>
  
@@ -404,7 +404,7 @@
 
 #define IO_APIC_ADDR	0xfec00000UL
 
-#else // CONFIG_HAVE_ACPI_TABLES
+#else // CONFIG_GENERATE_ACPI_TABLES
 
 #define write_acpi_tables(start) (start)
 

Modified: trunk/coreboot-v2/src/arch/i386/include/arch/pirq_routing.h
===================================================================
--- trunk/coreboot-v2/src/arch/i386/include/arch/pirq_routing.h	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/include/arch/pirq_routing.h	2009-10-15 13:35:47 UTC (rev 4778)
@@ -39,7 +39,7 @@
 
 extern const struct irq_routing_table intel_irq_routing_table;
 
-#if CONFIG_HAVE_PIRQ_TABLE==1
+#if CONFIG_GENERATE_PIRQ_TABLE==1
 unsigned long copy_pirq_routing_table(unsigned long start);
 unsigned long write_pirq_routing_table(unsigned long start);
 #if CONFIG_PIRQ_ROUTE==1

Modified: trunk/coreboot-v2/src/arch/i386/smp/Config.lb
===================================================================
--- trunk/coreboot-v2/src/arch/i386/smp/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/smp/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,6 +1,6 @@
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 
-if CONFIG_HAVE_MP_TABLE
+if CONFIG_GENERATE_MP_TABLE
   object mpspec.o 
 end
 #object ioapic.o CONFIG_IOAPIC

Modified: trunk/coreboot-v2/src/arch/i386/smp/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/arch/i386/smp/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/i386/smp/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,4 +1,4 @@
-obj-$(CONFIG_HAVE_MP_TABLE) += mpspec.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mpspec.o
 # what about this: how awkward.
 #object ioapic.o CONFIG_IOAPIC
 

Modified: trunk/coreboot-v2/src/arch/ppc/include/arch/pirq_routing.h
===================================================================
--- trunk/coreboot-v2/src/arch/ppc/include/arch/pirq_routing.h	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/arch/ppc/include/arch/pirq_routing.h	2009-10-15 13:35:47 UTC (rev 4778)
@@ -39,13 +39,13 @@
 
 extern const struct irq_routing_table intel_irq_routing_table;
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_HAVE_PIRQ_TABLE)
+#if defined(CONFIG_DEBUG) && defined(CONFIG_GENERATE_PIRQ_TABLE)
 void check_pirq_routing_table(void);
 #else
 #define check_pirq_routing_table() do {} while(0)
 #endif
 
-#if defined(CONFIG_HAVE_PIRQ_TABLE)
+#if defined(CONFIG_GENERATE_PIRQ_TABLE)
 unsigned long copy_pirq_routing_table(unsigned long start);
 #else
 #define copy_pirq_routing_table(start) (start)

Modified: trunk/coreboot-v2/src/config/Options.lb
===================================================================
--- trunk/coreboot-v2/src/config/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/config/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -601,7 +601,7 @@
 	export always
 	comment "Should application processors go to SIPI wait state after initialization? (Required for Intel Core Duo)"
 end
-define CONFIG_HAVE_MP_TABLE
+define CONFIG_GENERATE_MP_TABLE
 	default none
 	export used
 	comment "Define to build an MP table"
@@ -696,7 +696,7 @@
 # IRQ options
 ###############################################
 
-define CONFIG_HAVE_PIRQ_TABLE
+define CONFIG_GENERATE_PIRQ_TABLE
 	default none
 	export used
 	comment "Define if we have a PIRQ table"
@@ -886,7 +886,7 @@
 	comment "Use this to fake spd rom values"
 end
 
-define CONFIG_HAVE_ACPI_TABLES
+define CONFIG_GENERATE_ACPI_TABLES
 	default 0
 	export always
 	comment "Define to build ACPI tables"
@@ -1131,7 +1131,7 @@
 	comment "Enable if ACPI, PIRQ, MP tables are supposed to live in the low megabyte"
 end
 
-define CONFIG_HAVE_HIGH_TABLES
+define CONFIG_WRITE_HIGH_TABLES
 	default 0
 	export always
 	comment "Enable if ACPI, PIRQ, MP tables are supposed to live at top of memory"

Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -48,7 +48,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -101,7 +101,7 @@
 		ram_resource(dev, idx++, 0, 640);
 		ram_resource(dev, idx++, 768, tolmk - 768);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1 +1 @@
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o

Modified: trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -44,8 +44,8 @@
 
 driver-y += mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 ifdef POST_EVALUATION
 

Modified: trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -46,7 +46,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -66,11 +66,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024		# Override this in targets/*/Config.lb.
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 9		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -72,11 +72,11 @@
 default CONFIG_VIDEO_MB = 2
 
 default CONFIG_ROM_SIZE = 256 * 1024
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 2		# Override this in targets/*/Config.lb.
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1

Modified: trunk/coreboot-v2/src/mainboard/amd/db800/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/db800/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/db800/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/amd/db800/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/db800/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/db800/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,7 +27,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -67,7 +67,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -82,7 +82,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=4
 default CONFIG_PIRQ_ROUTE=1
 #object irq_tables.o

Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,13 +33,13 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE
 	object get_bus_conf.o
 	object irq_tables.o
 end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object acpi_tables.o
 	object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/dbm690t/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_SB600
 	select SUPERIO_ITE_IT8712F
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/dbm690t/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,11 +23,11 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/dbm690t/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ##
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -120,17 +120,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/mptable.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -142,7 +142,7 @@
 	/* PCI interrupts are level triggered, and are
 	 * associated with a specific bus/device/function tuple.
 	 */
-#if CONFIG_HAVE_ACPI_TABLES == 0
+#if CONFIG_GENERATE_ACPI_TABLES == 0
 #define PCI_INT(bus, dev, fn, pin) \
         smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, (bus), (((dev)<<2)|(fn)), apicid_sb600, (pin))
 #else

Modified: trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/norwich/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/amd/norwich/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/norwich/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/norwich/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,7 +27,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -67,7 +67,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -82,7 +82,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=6
 default CONFIG_PIRQ_ROUTE=1
 #object irq_tables.o

Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,13 +33,13 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE
 	object get_bus_conf.o
 	object irq_tables.o
 end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object acpi_tables.o
 	object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,6 +8,7 @@
 	select SOUTHBRIDGE_AMD_RS690
 	select SOUTHBRIDGE_AMD_SB600
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,11 +23,11 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ##
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -118,17 +118,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/mptable.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/mptable.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/mptable.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -142,7 +142,7 @@
 	/* PCI interrupts are level triggered, and are
 	 * associated with a specific bus/device/function tuple.
 	 */
-#if CONFIG_HAVE_ACPI_TABLES == 0
+#if CONFIG_GENERATE_ACPI_TABLES == 0
 #define PCI_INT(bus, dev, fn, pin) \
         smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, (bus), (((dev)<<2)|(fn)), apicid_sb600, (pin))
 #else

Modified: trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/rumba/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -26,7 +26,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -55,7 +55,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -70,7 +70,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -15,15 +15,15 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE 
+if CONFIG_GENERATE_MP_TABLE 
 	object mptable.o 
 end
 
-if CONFIG_HAVE_PIRQ_TABLE 
+if CONFIG_GENERATE_PIRQ_TABLE 
 	object irq_tables.o 
 end
 
-#if CONFIG_HAVE_ACPI_TABLES
+#if CONFIG_GENERATE_ACPI_TABLES
 #       object acpi_tables.o
 #       object fadt.o
 #       if CONFIG_SB_HT_CHAIN_ON_BUS0
@@ -41,7 +41,7 @@
 #       end
 #end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
         object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,11 +23,11 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # ./ssdt.o is in northbridge/amd/amdk8/Config.lb
 obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,6 +1,6 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -123,17 +123,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 ## extra SSDT num
 default CONFIG_ACPI_SSDTX_NUM=1
 

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,15 +33,15 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE
+if CONFIG_GENERATE_MP_TABLE
 	object mptable.o
 end
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	 object acpi_tables.o
 	 object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8132
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,17 +23,17 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # ./ssdt.o is in northbridge/amd/amdfam10/Makefile.inc
-obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt2.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt3.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt4.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt5.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o
 
 driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
 

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,9 +17,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -151,17 +151,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 ## extra SSDT num
 default CONFIG_ACPI_SSDTX_NUM=31
 

Modified: trunk/coreboot-v2/src/mainboard/arima/hdama/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/arima/hdama/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/arima/hdama/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,8 +13,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/arima/hdama/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/arima/hdama/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/arima/hdama/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_NSC_PC87360
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/arima/hdama/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/arima/hdama/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/arima/hdama/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,8 +22,8 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable.
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/arima/hdama/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/arima/hdama/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/arima/hdama/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -88,14 +88,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=9
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	#compile cache_as_ram.c to auto.inc

Modified: trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,7 +27,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -67,7 +67,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -82,7 +82,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=3
 default CONFIG_PIRQ_ROUTE=1
 #object irq_tables.o

Modified: trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -72,11 +72,11 @@
 default CONFIG_VIDEO_MB = 2
 
 default CONFIG_ROM_SIZE = 256 * 1024
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 3		# Override this in targets/*/Config.lb.
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1

Modified: trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,4 +1,4 @@
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -67,7 +67,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=5
 default CONFIG_PIRQ_ROUTE=1
 

Modified: trunk/coreboot-v2/src/mainboard/asus/a8n_e/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8n_e/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8n_e/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -29,8 +29,8 @@
 driver mainboard.o
 # Needed by irq_tables and mptable and acpi_tables.
 object get_bus_conf.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 	if CONFIG_USE_INIT
 		makerule ./auto.o
 			depends "$(CONFIG_MAINBOARD)/cache_as_ram_auto.c option_table.h"

Modified: trunk/coreboot-v2/src/mainboard/asus/a8n_e/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8n_e/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8n_e/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,6 +8,7 @@
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SUPERIO_ITE_IT8712F
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/asus/a8n_e/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8n_e/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8n_e/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/asus/a8n_e/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8n_e/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8n_e/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,8 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_USE_FAILOVER_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -103,9 +103,9 @@
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_HAVE_FAILOVER_BOOT = 1
 default CONFIG_HAVE_HARD_RESET = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 13
-default CONFIG_HAVE_MP_TABLE = 1
+default CONFIG_GENERATE_MP_TABLE = 1
 default CONFIG_HAVE_OPTION_TABLE = 1
 # Move the default coreboot CMOS range off of AMD RTC registers.
 default CONFIG_LB_CKS_RANGE_START = 49

Modified: trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -28,7 +28,7 @@
 arch i386 end 
 
 driver mainboard.o
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
   object acpi_tables.o
   makerule dsdt.c
     depends "$(CONFIG_MAINBOARD)/dsdt.asl"
@@ -37,8 +37,8 @@
   end
   object ./dsdt.o
 end
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
 
   if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,6 +12,7 @@
 	select HAVE_HARD_RESET
 	select IOAPIC
 	select HAVE_ACPI_TABLES
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,10 +1,10 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/a8v-e_se/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,8 +17,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -42,7 +42,7 @@
 uses CONFIG_HEAP_SIZE
 # uses CONFIG_USE_OPTION_TABLE
 # uses CONFIG_LB_MEM_TOPK
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_LB_CKS_RANGE_START
 uses CONFIG_LB_CKS_RANGE_END
@@ -94,8 +94,8 @@
 default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 0
-default CONFIG_HAVE_MP_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 1
 default CONFIG_HAVE_OPTION_TABLE = 0	# FIXME
 # Move the default coreboot CMOS range off of AMD RTC registers.
 default CONFIG_LB_CKS_RANGE_START = 49
@@ -105,7 +105,7 @@
 default CONFIG_MAX_CPUS = 2
 default CONFIG_MAX_PHYSICAL_CPUS = 1
 default CONFIG_LOGICAL_CPUS = 1
-default CONFIG_HAVE_ACPI_TABLES = 1
+default CONFIG_GENERATE_ACPI_TABLES = 1
 
 # 1G memory hole
 # bx_b001- default K8_HW_MEM_HOLE_SIZEK = 0x100000

Modified: trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -27,7 +27,7 @@
 arch i386 end 
 
 driver mainboard.o
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
   object acpi_tables.o
   makerule dsdt.c
     depends "$(CONFIG_MAINBOARD)/dsdt.asl"

Modified: trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 driver-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,8 +17,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -42,7 +42,7 @@
 uses CONFIG_HEAP_SIZE
 uses CONFIG_USE_OPTION_TABLE
 uses CONFIG_LB_MEM_TOPK
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_MAINBOARD_RESOURCES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_HAVE_LOW_TABLES
@@ -95,8 +95,8 @@
 
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_HAVE_HARD_RESET = 1
-default CONFIG_HAVE_PIRQ_TABLE = 0
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_PIRQ_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_OPTION_TABLE = 1	# FIXME
 # Move the default coreboot CMOS range off of AMD RTC registers.
 default CONFIG_LB_CKS_RANGE_START = 49
@@ -106,7 +106,7 @@
 default CONFIG_MAX_CPUS = 2
 default CONFIG_MAX_PHYSICAL_CPUS = 1
 default CONFIG_LOGICAL_CPUS = 1
-default CONFIG_HAVE_ACPI_TABLES = 1
+default CONFIG_GENERATE_ACPI_TABLES = 1
 default CONFIG_HAVE_MAINBOARD_RESOURCES = 1
 default CONFIG_HAVE_LOW_TABLES = 0
 default CONFIG_HAVE_ACPI_RESUME = 1

Modified: trunk/coreboot-v2/src/mainboard/asus/mew-am/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/mew-am/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/mew-am/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 512 * 1024		# Override this in targets/*/Config.lb.
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 8		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/mew-vm/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -26,7 +26,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -55,7 +55,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -65,7 +65,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 11
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -46,7 +46,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -66,11 +66,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 6		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-d/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-d/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-d/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,8 +25,8 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 makerule ./failover.E
 	depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
 	action "../romcc -E -O2 -mcpu=p2 --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -46,7 +46,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -69,11 +69,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 1
+default CONFIG_GENERATE_MP_TABLE = 1
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 6		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,8 +25,8 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 makerule ./failover.E
 	depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
 	action "../romcc -E -O2 -mcpu=p2 --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -46,7 +46,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -69,11 +69,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 1
+default CONFIG_GENERATE_MP_TABLE = 1
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-f/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-f/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-f/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/asus/p3b-f/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p3b-f/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p3b-f/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 8		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/axus/tc320/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/axus/tc320/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/axus/tc320/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 makerule ./failover.E
 	depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
 	action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"

Modified: trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -75,11 +75,11 @@
 default CONFIG_MAINBOARD_VENDOR = "AXUS"
 default CONFIG_MAINBOARD_PART_NUMBER = "TC320"
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 2	# Soldered NIC, internal USB, no real slots
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_OPTION_TABLE = 0

Modified: trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 default CONFIG_XIP_ROM_BASE = 0xffffffff - CONFIG_XIP_ROM_SIZE + 1
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/bcom/winnet100/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/bcom/winnet100/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnet100/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -75,11 +75,11 @@
 default CONFIG_MAINBOARD_VENDOR = "BCOM"
 default CONFIG_MAINBOARD_PART_NUMBER = "WinNET100"
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 2	# Soldered NIC, internal USB, no real slots
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_OPTION_TABLE = 0

Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,9 +25,9 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object dsdt.o
 	object acpi_tables.o

Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,12 +21,12 @@
 
 initobj-y += crt0.o
 obj-y += mainboard.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,8 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -47,8 +47,8 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
@@ -72,13 +72,13 @@
 default CONFIG_PCI_ROM_RUN = 0
 default CONFIG_CONSOLE_VGA = 0
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 10
-default CONFIG_HAVE_ACPI_TABLES = 0
+default CONFIG_GENERATE_ACPI_TABLES = 0
 default CONFIG_HAVE_OPTION_TABLE = 1
 default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
 default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE

Modified: trunk/coreboot-v2/src/mainboard/biostar/m6tba/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/biostar/m6tba/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/biostar/m6tba/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/broadcom/blast/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,8 +12,8 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE 
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE 
 	object get_bus_conf.o
 	object irq_tables.o 
 end

Modified: trunk/coreboot-v2/src/mainboard/broadcom/blast/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/broadcom/blast/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/broadcom/blast/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_BROADCOM_BCM5785
 	select SUPERIO_NSC_PC87417
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/broadcom/blast/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/broadcom/blast/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/broadcom/blast/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -2,8 +2,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
 

Modified: trunk/coreboot-v2/src/mainboard/broadcom/blast/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/broadcom/blast/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/broadcom/blast/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,6 +1,6 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -93,14 +93,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 5		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,7 +6,8 @@
 	select SOUTHBRIDGE_INTEL_I82801ER
 	select SOUTHBRIDGE_INTEL_PXHD
 	select SUPERIO_NSC_PC8374
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -41,8 +41,8 @@
 
 driver-y += mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 ifdef POST_EVALUATION
 

Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -80,14 +80,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=9
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,7 +13,7 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,7 +27,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -52,7 +52,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -67,7 +67,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=5
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -15,7 +15,7 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -28,7 +28,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,7 +65,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -75,7 +75,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,7 +27,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -67,7 +67,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -82,7 +82,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=9
 default CONFIG_PIRQ_ROUTE=1
 #object irq_tables.o

Modified: trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -26,7 +26,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -57,7 +57,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -72,7 +72,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 default CONFIG_PIRQ_ROUTE=1
 #object irq_tables.o

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -34,7 +34,7 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -4,6 +4,7 @@
 	select CPU_I586
 	select SOUTHBRIDGE_INTEL_I82371EB
 	select CPU_EMULATION_QEMU_X86
+	select HAVE_PIRQ_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,6 +6,7 @@
 crt0-y += auto.inc
 
 obj-y += mainboard.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -28,8 +28,8 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_WRITE_HIGH_TABLES
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -67,7 +67,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -77,10 +77,10 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=6
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 6		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -35,8 +35,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,11 +7,10 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_SIS_SIS966
 	select SUPERIO_ITE_IT8716F
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select HAVE_HIGH_TABLES
 	select IOAPIC
 	select MEM_TRAIN_SEQ
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o
 obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o
 

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/ga_2761gxdk/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,9 +21,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -151,17 +151,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=0
+default CONFIG_GENERATE_ACPI_TABLES=0
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,8 +33,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	if CONFIG_USE_INIT	
@@ -166,7 +166,7 @@
 ##
 ## ACPI Support
 ##
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object acpi_tables.o
 	makerule dsdt.c
 		depends "$(CONFIG_MAINBOARD)/dsdt.asl"

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,11 +8,11 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_ITE_IT8716F
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select HAVE_HIGH_TABLES
 	select IOAPIC
 	select MEM_TRAIN_SEQ
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,12 +23,12 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o
 obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 obj-$(CONFIG_HAVE_FANCTL) += fanctl.o
 
 # This is part of the conversion to init-obj and away from included code. 

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/m57sli/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -84,7 +84,7 @@
 uses CONFIG_HW_MEM_HOLE_SIZE_AUTO_INC
 uses CONFIG_K8_HT_FREQ_1G_SUPPORT
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 uses CONFIG_HT_CHAIN_UNITID_BASE
 uses CONFIG_HT_CHAIN_END_UNITID_BASE
@@ -157,20 +157,20 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## HIGH tables support
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -40,8 +40,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 	makerule ./auto.o

Modified: trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_BROADCOM_BCM5785
 	select SUPERIO_NSC_PC87417
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -2,8 +2,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/hp/dl145_g3/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,9 +24,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -136,14 +136,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e325/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,8 +13,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/ibm/e325/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e325/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e325/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_NSC_PC87366
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/ibm/e325/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e325/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e325/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,8 +22,8 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/ibm/e325/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e325/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e325/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -77,14 +77,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=12
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e326/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,8 +13,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/ibm/e326/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e326/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e326/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_NSC_PC87366
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/ibm/e326/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e326/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e326/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,8 +22,8 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/ibm/e326/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/ibm/e326/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/ibm/e326/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -79,14 +79,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=12
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/juki-511p/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -31,7 +31,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/iei/juki-511p/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/juki-511p/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/juki-511p/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,6 @@
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
 	select SUPERIO_WINBOND_W83977F
-	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select HAVE_OPTION_TABLE
 	select UDELAY_TSC

Modified: trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -29,7 +29,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -58,7 +58,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -69,8 +69,8 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-# FIXME: There's an irq_tables.c file, but CONFIG_HAVE_PIRQ_TABLE is 0.
-default CONFIG_HAVE_PIRQ_TABLE=0
+# FIXME: There's an irq_tables.c file, but CONFIG_GENERATE_PIRQ_TABLE is 0.
+default CONFIG_GENERATE_PIRQ_TABLE=0
 default CONFIG_IRQ_SLOT_COUNT=2
 default CONFIG_PIRQ_ROUTE=1
 

Modified: trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/nova4899r/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -15,7 +15,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -24,7 +24,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -64,7 +64,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -79,7 +79,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=5
 default CONFIG_PIRQ_ROUTE=1
 #object irq_tables.o

Modified: trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 	# Compile cache_as_ram.c to auto.inc.

Modified: trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -48,7 +48,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -74,10 +74,10 @@
 default CONFIG_VIDEO_MB = 8
 default CONFIG_PCI_ROM_RUN = 0
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_IO = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 9
 default CONFIG_PIRQ_ROUTE = 1
 default CONFIG_HAVE_OPTION_TABLE = 0

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -43,10 +43,10 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object acpi_tables.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,6 +7,7 @@
 	select SUPERIO_INTEL_I3100
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select UDELAY_TSC

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,9 +1,9 @@
 driver-y += mainboard.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
 obj-y += reset.o
 
 # This is part of the conversion to init-obj and away from included code.

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -20,15 +20,15 @@
 ##
 
 # Tables
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_IRQ_SLOT_COUNT
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_USE_OPTION_TABLE
 uses CONFIG_LB_CKS_RANGE_START
 uses CONFIG_LB_CKS_RANGE_END
 uses CONFIG_LB_CKS_LOC
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_MAINBOARD_RESOURCES
 # SMP
 uses CONFIG_SMP
@@ -153,19 +153,19 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=9
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to provide ACPI support
 ##
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 default CONFIG_HAVE_MAINBOARD_RESOURCES=1
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/intel/jarrell/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/jarrell/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/jarrell/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,6 +7,7 @@
 	select SOUTHBRIDGE_INTEL_I82801ER
 	select SUPERIO_NSC_PC87427
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select UDELAY_TSC
 	select ATI_RAGE_XL
 

Modified: trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -93,14 +93,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=18
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/intel/mtarvon/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/mtarvon/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/mtarvon/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -32,8 +32,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 ##
 ## Romcc output

Modified: trunk/coreboot-v2/src/mainboard/intel/mtarvon/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/mtarvon/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/mtarvon/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,6 +6,7 @@
 	select SOUTHBRIDGE_INTEL_I3100
 	select SUPERIO_INTEL_I3100
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select UDELAY_TSC
 
 config MAINBOARD_DIR

Modified: trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,8 +17,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -95,14 +95,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=1
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code for SMP support

Modified: trunk/coreboot-v2/src/mainboard/intel/truxton/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/truxton/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/truxton/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -32,8 +32,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 ##
 ## Romcc output

Modified: trunk/coreboot-v2/src/mainboard/intel/truxton/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/truxton/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/truxton/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,6 +7,7 @@
 	select SUPERIO_INTEL_I3100
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select UDELAY_TSC
 
 config MAINBOARD_DIR

Modified: trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,8 +17,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -97,14 +97,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=1
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code for SMP support

Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,9 +9,9 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE 		object mptable.o 	 end
-if CONFIG_HAVE_PIRQ_TABLE 		object irq_tables.o	 end
-if CONFIG_HAVE_ACPI_TABLES 	object acpi_tables.o end
+if CONFIG_GENERATE_MP_TABLE 		object mptable.o 	 end
+if CONFIG_GENERATE_PIRQ_TABLE 		object irq_tables.o	 end
+if CONFIG_GENERATE_ACPI_TABLES 	object acpi_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,6 +7,7 @@
 	select SOUTHBRIDGE_INTEL_I82801CA
 	select SUPERIO_SMSC_LPC47B272
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select UDELAY_TSC
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES

Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,4 +1,4 @@
 ROMCCFLAGS := -mcpu=p4 -O2
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 include $(src)/mainboard/Makefile.romccboard.inc
 

Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_IRQ_SLOT_COUNT
@@ -85,17 +85,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=12
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## Build code to export ACPI tables?
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table?

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -15,15 +15,15 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE 
+if CONFIG_GENERATE_MP_TABLE 
 	object mptable.o 
 end
 
-if CONFIG_HAVE_PIRQ_TABLE 
+if CONFIG_GENERATE_PIRQ_TABLE 
 	object irq_tables.o 
 end
 
-#if CONFIG_HAVE_ACPI_TABLES
+#if CONFIG_GENERATE_ACPI_TABLES
 #       object acpi_tables.o
 #       object fadt.o
 #       if CONFIG_SB_HT_CHAIN_ON_BUS0
@@ -41,7 +41,7 @@
 #       end
 #end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
         object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,11 +23,11 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # ./ssdt.o is in northbridge/amd/amdk8/Config.lb
 obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8_htx/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,6 +1,6 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -125,17 +125,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 ## extra SSDT num
 default CONFIG_ACPI_SSDTX_NUM=3
 

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,8 +13,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ## ATI Rage XL framebuffering graphics driver

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,8 +22,8 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8s2/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -78,14 +78,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=12
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8x/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,8 +13,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8x/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8x/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8x/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627THF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8x/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8x/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8x/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,8 +21,8 @@
 
 driver-y += mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/iwill/dk8x/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iwill/dk8x/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/iwill/dk8x/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -78,14 +78,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=9
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/jetway/j7f24/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/jetway/j7f24/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,9 +25,9 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object dsdt.o
 	object acpi_tables.o

Modified: trunk/coreboot-v2/src/mainboard/jetway/j7f24/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/jetway/j7f24/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,8 +21,8 @@
 
 initobj-y += crt0.o
 obj-y += mainboard.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,8 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -47,8 +47,8 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
@@ -73,13 +73,13 @@
 default CONFIG_PCI_ROM_RUN = 0
 default CONFIG_CONSOLE_VGA = 0
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 10
-default CONFIG_HAVE_ACPI_TABLES = 0
+default CONFIG_GENERATE_ACPI_TABLES = 0
 default CONFIG_HAVE_OPTION_TABLE = 0
 default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
 default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -46,11 +46,11 @@
 
 driver mainboard.o
 driver rtl8168.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 if CONFIG_HAVE_SMI_HANDLER smmobject mainboard_smi.o end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object acpi_tables.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,6 +7,7 @@
 	select SOUTHBRIDGE_INTEL_I82801GX
 	select SUPERIO_WINBOND_W83627THG
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select AP_IN_SIPI_WAIT

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -27,11 +27,11 @@
 driver-y += rtl8168.o
 
 #obj-y += ../../../southbridge/intel/i82801gx/i82801gx_reset.c
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o
 

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -20,15 +20,15 @@
 ##
 
 # Tables
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_IRQ_SLOT_COUNT
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_USE_OPTION_TABLE
 uses CONFIG_LB_CKS_RANGE_START
 uses CONFIG_LB_CKS_RANGE_END
 uses CONFIG_LB_CKS_LOC
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_HAVE_MAINBOARD_RESOURCES
 # SMP
@@ -156,19 +156,19 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=18
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to provide ACPI support
 ##
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 default CONFIG_HAVE_MAINBOARD_RESOURCES=1
 default CONFIG_HAVE_ACPI_RESUME=1
 

Modified: trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/acpi_tables.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/acpi_tables.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/986lcd-m/acpi_tables.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -355,7 +355,7 @@
 
 	printk_debug("ACPI:     * DMI (Linux workaround)\n");
 	memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE);
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 	memcpy((void *)current, dmi_table, DMI_TABLE_SIZE);
 	current += DMI_TABLE_SIZE;
 	ALIGN_CURRENT;

Modified: trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/kt690/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,13 +33,13 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE
 	object get_bus_conf.o
 	object irq_tables.o
 end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object acpi_tables.o
 	object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/kontron/kt690/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/kt690/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/kt690/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,11 +23,11 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/kt690/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -20,9 +20,9 @@
 ##
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -121,17 +121,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/kontron/kt690/mptable.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/kontron/kt690/mptable.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/kontron/kt690/mptable.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -142,7 +142,7 @@
 	/* PCI interrupts are level triggered, and are
 	 * associated with a specific bus/device/function tuple.
 	 */
-#if CONFIG_HAVE_ACPI_TABLES == 0
+#if CONFIG_GENERATE_ACPI_TABLES == 0
 #define PCI_INT(bus, dev, fn, pin) \
         smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, (bus), (((dev)<<2)|(fn)), apicid_sb600, (pin))
 #else

Modified: trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -26,7 +26,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -55,7 +55,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -70,7 +70,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -36,7 +36,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -20,8 +20,8 @@
 
 ## Based on Options.lb from AMD's DB800 mainboard.
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -50,7 +50,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -91,7 +91,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -106,7 +106,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7
 default CONFIG_PIRQ_ROUTE = 1
 

Modified: trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -35,7 +35,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -20,8 +20,8 @@
 
 ## Based on Options.lb from AMD's DB800 mainboard.
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -50,7 +50,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -91,7 +91,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -106,7 +106,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7
 default CONFIG_PIRQ_ROUTE = 1
 

Modified: trunk/coreboot-v2/src/mainboard/mitac/6513wu/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/mitac/6513wu/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/mitac/6513wu/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/mitac/6513wu/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/mitac/6513wu/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/mitac/6513wu/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -27,9 +27,9 @@
 uses CONFIG_FALLBACK_SIZE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_HAVE_OPTION_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_HEAP_SIZE
 uses CONFIG_IRQ_SLOT_COUNT
 uses CONFIG_MAINBOARD
@@ -64,8 +64,8 @@
 default CONFIG_MAINBOARD_VENDOR = "Mitac"
 default CONFIG_MAINBOARD_PART_NUMBER = "6513WU"
 default CONFIG_IRQ_SLOT_COUNT = 8
-default CONFIG_HAVE_PIRQ_TABLE = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_OPTION_TABLE = 0
 default CONFIG_USE_OPTION_TABLE = 0
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6119/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6119/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6119/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6147/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6147/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6147/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -26,7 +26,7 @@
 arch i386 end
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 8		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6156/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6156/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6156/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6156/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6156/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6156/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7
 default CONFIG_MAINBOARD_VENDOR = "MSI"
 default CONFIG_MAINBOARD_PART_NUMBER = "MS-6156"

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6178/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
 makerule ./failover.E
 	depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -46,7 +46,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -61,14 +61,14 @@
 uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 uses CONFIG_VIDEO_MB
 
 default CONFIG_ROM_SIZE = 512 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 4		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
@@ -94,6 +94,6 @@
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_CONSOLE_VGA = 1
 default CONFIG_PCI_ROM_RUN = 1
-default CONFIG_HAVE_HIGH_TABLES = 1
+default CONFIG_WRITE_HIGH_TABLES = 1
 default CONFIG_VIDEO_MB = 1
 end

Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -39,11 +39,11 @@
 # Needed by irq_tables and mptable and acpi_tables.
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE
+if CONFIG_GENERATE_MP_TABLE
 	object mptable.o
 end
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms7135/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms7135/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,7 +7,8 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SUPERIO_WINBOND_W83627THF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_DCACHE_RAM
 	select USE_PRINTK_IN_CAR
 	select SERIAL_CPU_INIT

Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms7135/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms7135/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -20,8 +20,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_USE_FAILOVER_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -132,14 +132,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=13
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms7260/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -26,8 +26,8 @@
 
 driver mainboard.o
 object get_bus_conf.o # Needed by irq_tables and mptable (and acpi_tables).
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
 
   if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/msi/ms7260/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms7260/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms7260/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,11 +7,11 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627EHG
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select HAVE_HIGH_TABLES
 	select IOAPIC
 	select MEM_TRAIN_SEQ
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

Modified: trunk/coreboot-v2/src/mainboard/msi/ms7260/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms7260/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms7260/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o
 obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms7260/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms7260/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms7260/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_USE_FAILOVER_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -104,9 +104,9 @@
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_HAVE_FAILOVER_BOOT = 1
 default CONFIG_HAVE_HARD_RESET = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 11		# TODO: Check if correct.
-default CONFIG_HAVE_MP_TABLE = 1		# TODO: Check if correct.
+default CONFIG_GENERATE_MP_TABLE = 1		# TODO: Check if correct.
 default CONFIG_HAVE_OPTION_TABLE = 1
 default CONFIG_SMP = 1
 default CONFIG_MAX_CPUS = 2

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9185/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9185/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9185/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -39,11 +39,11 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE
+if CONFIG_GENERATE_MP_TABLE
        object mptable.o
 end
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
        object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,9 +9,11 @@
 	select SOUTHBRIDGE_BROADCOM_BCM5785
 	select SUPERIO_NSC_PC87417
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
+	select HAVE_ACPI_TABLES
 	select IOAPIC
 
 config MAINBOARD_DIR

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9185/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9185/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9185/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -2,8 +2,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9185/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9185/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9185/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,9 +22,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -133,17 +133,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-#default CONFIG_HAVE_ACPI_TABLES=1
+#default CONFIG_GENERATE_ACPI_TABLES=1
 ## extra SSDT num
 #default CONFIG_ACPI_SSDTX_NUM=1
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9282/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -41,8 +41,8 @@
 object get_bus_conf.o
 
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9282/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9282/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9282/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,11 +7,11 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627EHG
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select HAVE_HIGH_TABLES
 	select IOAPIC
 	select MEM_TRAIN_SEQ
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9282/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9282/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9282/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,8 +25,8 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o
 obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o
 

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9282/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9282/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9282/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,8 +22,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -128,14 +128,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/nec/powermate2000/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
 makerule ./failover.E
 	depends "$(CONFIG_MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"

Modified: trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -46,7 +46,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -64,9 +64,9 @@
 
 default CONFIG_ROM_SIZE = 512 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 5		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/newisys/khepri/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,8 +13,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/newisys/khepri/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/newisys/khepri/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/newisys/khepri/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/newisys/khepri/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/newisys/khepri/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/newisys/khepri/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,8 +21,8 @@
 
 driver-y += mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/newisys/khepri/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/newisys/khepri/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/newisys/khepri/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -85,14 +85,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=9
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,11 +33,11 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object acpi_tables.o
 	object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,11 +7,11 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627EHG
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select HAVE_HIGH_TABLES
 	select IOAPIC
 	select MEM_TRAIN_SEQ
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

Modified: trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o
 obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o
 

Modified: trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/nvidia/l1_2pvv/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -149,17 +149,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=0
+default CONFIG_GENERATE_ACPI_TABLES=0
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/olpc/btest/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,7 +27,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -56,7 +56,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -71,7 +71,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/olpc/rev_a/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,7 +14,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,7 +27,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -56,7 +56,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -71,7 +71,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -34,7 +34,7 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 

Modified: trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += mainboard.o
 
 # Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -47,7 +47,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -87,7 +87,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -102,7 +102,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=5
 default CONFIG_PIRQ_ROUTE=1
 ##

Modified: trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/rca/rm4100/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,9 +24,9 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object dsdt.o
 	object acpi_tables.o

Modified: trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -32,12 +32,12 @@
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_FALLBACK_SIZE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_HAVE_FALLBACK_BOOT
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_HAVE_OPTION_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_HEAP_SIZE
 uses HOSTCC
 uses CONFIG_IRQ_SLOT_COUNT
@@ -68,10 +68,10 @@
 default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7
-default CONFIG_HAVE_MP_TABLE = 0
-default CONFIG_HAVE_ACPI_TABLES = 0
+default CONFIG_GENERATE_MP_TABLE = 0
+default CONFIG_GENERATE_ACPI_TABLES = 0
 default CONFIG_IOAPIC = 0
 default CONFIG_HAVE_OPTION_TABLE = 0
 default CONFIG_CONSOLE_VGA = 0

Modified: trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7		# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.

Modified: trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/sunw/ultra40/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,8 +14,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 	if CONFIG_USE_INIT	
 		makerule ./auto.o

Modified: trunk/coreboot-v2/src/mainboard/sunw/ultra40/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/sunw/ultra40/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/sunw/ultra40/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,6 +8,7 @@
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SUPERIO_SMSC_LPC47M10X
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/sunw/ultra40/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/sunw/ultra40/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/sunw/ultra40/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/sunw/ultra40/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -98,14 +98,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -30,8 +30,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	if CONFIG_USE_INIT	

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,6 +8,7 @@
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,8 +24,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dme/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -153,17 +153,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=0
+default CONFIG_GENERATE_ACPI_TABLES=0
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,8 +33,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	if CONFIG_USE_INIT	

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,6 +8,7 @@
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -146,17 +146,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=0
+default CONFIG_GENERATE_ACPI_TABLES=0
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -35,8 +35,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	if CONFIG_USE_INIT	

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,6 +8,7 @@
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr_fam10/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -148,17 +148,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=0
+default CONFIG_GENERATE_ACPI_TABLES=0
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -5,7 +5,8 @@
 	select NORTHBRIDGE_INTEL_E7525
 	select SOUTHBRIDGE_INTEL_ESB6300
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -80,14 +80,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,8 +17,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,7 +6,8 @@
 	select SOUTHBRIDGE_INTEL_ESB6300
 	select SOUTHBRIDGE_INTEL_PXHD
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -80,14 +80,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,8 +17,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,7 +6,8 @@
 	select SOUTHBRIDGE_INTEL_I82801ER
 	select SOUTHBRIDGE_INTEL_PXHD
 	select SUPERIO_NSC_PC87427
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -80,14 +80,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,7 +6,8 @@
 	select SOUTHBRIDGE_INTEL_I82801ER
 	select SOUTHBRIDGE_INTEL_PXHD
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -80,14 +80,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,7 +6,8 @@
 	select SOUTHBRIDGE_INTEL_I82801ER
 	select SOUTHBRIDGE_INTEL_PXHD
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -80,14 +80,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim5690/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,13 +33,13 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE
 	object get_bus_conf.o
 	object irq_tables.o
 end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object acpi_tables.o
 	object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim5690/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim5690/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim5690/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_SB600
 	select SUPERIO_ITE_IT8712F
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim5690/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim5690/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim5690/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,11 +23,11 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim5690/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim5690/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim5690/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ##
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -119,17 +119,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim5690/mptable.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim5690/mptable.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim5690/mptable.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -142,7 +142,7 @@
 	/* PCI interrupts are level triggered, and are
 	 * associated with a specific bus/device/function tuple.
 	 */
-#if CONFIG_HAVE_ACPI_TABLES == 0
+#if CONFIG_GENERATE_ACPI_TABLES == 0
 #define PCI_INT(bus, dev, fn, pin) \
         smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, (bus), (((dev)<<2)|(fn)), apicid_sb600, (pin))
 #else

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim8690/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,13 +33,13 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE
 	object get_bus_conf.o
 	object irq_tables.o
 end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object acpi_tables.o
 	object fadt.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim8690/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim8690/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim8690/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_SB600
 	select SUPERIO_ITE_IT8712F
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim8690/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim8690/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim8690/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,11 +23,11 @@
 
 # Needed by irq_tables and mptable and acpi_tables.
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim8690/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim8690/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim8690/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ##
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
@@ -118,17 +118,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/technexion/tim8690/mptable.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/technexion/tim8690/mptable.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technexion/tim8690/mptable.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -142,7 +142,7 @@
 	/* PCI interrupts are level triggered, and are
 	 * associated with a specific bus/device/function tuple.
 	 */
-#if CONFIG_HAVE_ACPI_TABLES == 0
+#if CONFIG_GENERATE_ACPI_TABLES == 0
 #define PCI_INT(bus, dev, fn, pin) \
         smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, (bus), (((dev)<<2)|(fn)), apicid_sb600, (pin))
 #else

Modified: trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technologic/ts5300/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -16,7 +16,7 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/technologic/ts5300/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/technologic/ts5300/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/technologic/ts5300/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -28,7 +28,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -80,7 +80,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -90,7 +90,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/televideo/tc7020/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/televideo/tc7020/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/televideo/tc7020/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,7 +24,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -75,11 +75,11 @@
 default CONFIG_MAINBOARD_VENDOR = "TeleVideo"
 default CONFIG_MAINBOARD_PART_NUMBER = "TC7020"
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_PIRQ_ROUTE=1
 default CONFIG_IRQ_SLOT_COUNT = 3	# Soldered NIC, internal USB, mini PCI slot
 default CONFIG_HAVE_OPTION_TABLE = 0

Modified: trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/thomson/ip1000/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,9 +24,9 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 # object reset.o
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object dsdt.o
 	object acpi_tables.o

Modified: trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -32,12 +32,12 @@
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_FALLBACK_SIZE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_HAVE_FALLBACK_BOOT
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_HAVE_OPTION_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_HEAP_SIZE
 uses HOSTCC
 uses CONFIG_IRQ_SLOT_COUNT
@@ -68,10 +68,10 @@
 default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7
-default CONFIG_HAVE_MP_TABLE = 0
-default CONFIG_HAVE_ACPI_TABLES = 0
+default CONFIG_GENERATE_MP_TABLE = 0
+default CONFIG_GENERATE_ACPI_TABLES = 0
 default CONFIG_IOAPIC = 0
 default CONFIG_HAVE_OPTION_TABLE = 0
 default CONFIG_CONSOLE_VGA = 0

Modified: trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -27,10 +27,10 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  acpi_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 
 #driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s1846/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s1846/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s1846/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,7 +25,7 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE
+if CONFIG_GENERATE_PIRQ_TABLE
 	object irq_tables.o
 end
 makerule ./failover.E

Modified: trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -45,7 +45,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -65,11 +65,11 @@
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
-default CONFIG_HAVE_PIRQ_TABLE = 0
+default CONFIG_GENERATE_PIRQ_TABLE = 0
 default CONFIG_MAINBOARD_VENDOR = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_MAINBOARD_PART_NUMBER = "N/A"	# Override this in targets/*/Config.lb.
 default CONFIG_ROM_IMAGE_SIZE = 36 * 1024

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -10,8 +10,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 object reset.o
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2735/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2735/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,6 +7,7 @@
 	select SOUTHBRIDGE_INTEL_I82801ER
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select UDELAY_TSC
 	select HAVE_OPTION_TABLE
 	select USE_DCACHE_RAM

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2735/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,8 +25,8 @@
 
 driver-y +=  mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 #driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2735/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2735/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -97,14 +97,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2850/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2850/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2850/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,8 +12,8 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2850/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2850/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2850/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -7,7 +7,8 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2850/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2850/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2850/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -86,14 +86,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=12
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2875/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2875/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2875/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,8 +12,8 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2875/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2875/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2875/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_AMD_AMD8151
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2875/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2875/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2875/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -87,14 +87,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=13
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2880/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2880/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2880/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,8 +12,8 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2880/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2880/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2880/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select AP_CODE_IN_CAR
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -26,10 +26,10 @@
 driver-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  acpi_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 
 #driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2880/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2880/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2880/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -86,14 +86,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=13
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2881/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2881/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2881/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,8 +12,8 @@
 
 #dir /drivers/si/3114
 object get_bus_conf.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2881/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2881/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2881/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select AP_CODE_IN_CAR
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2881/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2881/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2881/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -91,14 +91,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=9
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2882/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2882/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2882/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,8 +12,8 @@
 
 #dir /drivers/si/3114
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2882/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2882/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2882/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select AP_CODE_IN_CAR
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -26,10 +26,10 @@
 driver-y +=  mainboard.o
 
 #needed by irq_tables and mptable and acpi_tables
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) +=  acpi_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) +=  acpi_tables.o
 
 #driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2882/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2882/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2882/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -86,14 +86,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2885/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2885/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2885/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,8 +12,8 @@
 
 #dir /drivers/si/3114
 object get_bus_conf.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2885/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2885/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2885/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select AP_CODE_IN_CAR
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2885/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2885/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2885/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -97,14 +97,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2891/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -16,11 +16,11 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
 	makerule dsdt.c
 		depends "$(CONFIG_MAINBOARD)/dsdt.dsl"

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select AP_CODE_IN_CAR
 	select HAVE_ACPI_TABLES

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2891/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2891/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2891/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -28,7 +28,7 @@
 uses CONFIG_LB_CKS_RANGE_START
 uses CONFIG_LB_CKS_RANGE_END
 uses CONFIG_LB_CKS_LOC
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_HAVE_LOW_TABLES
 uses CONFIG_MULTIBOOT
@@ -109,19 +109,19 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to provide ACPI support
 ##
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 default CONFIG_HAVE_LOW_TABLES=1
 default CONFIG_MULTIBOOT=0
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2892/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,11 +17,11 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
 	makerule dsdt.c
 		depends "$(CONFIG_MAINBOARD)/dsdt.dsl"

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select AP_CODE_IN_CAR
 	select HAVE_ACPI_TABLES

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2892/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2892/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2892/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -28,7 +28,7 @@
 uses CONFIG_LB_CKS_RANGE_START
 uses CONFIG_LB_CKS_RANGE_END
 uses CONFIG_LB_CKS_LOC
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_HAVE_LOW_TABLES
 uses CONFIG_MULTIBOOT
@@ -103,19 +103,19 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to provide ACPI support
 ##
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 default CONFIG_HAVE_LOW_TABLES=1
 default CONFIG_MULTIBOOT=0
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2895/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -12,11 +12,11 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
         object acpi_tables.o
 	makerule dsdt.c
 		depends "$(CONFIG_MAINBOARD)/dsdt.dsl"

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_SMSC_LPC47B397
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select SERIAL_CPU_INIT
 	select AP_CODE_IN_CAR
 	select HAVE_ACPI_TABLES

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2895/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2895/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_USE_FAILOVER_IMAGE
@@ -31,7 +31,7 @@
 uses CONFIG_LB_CKS_RANGE_START
 uses CONFIG_LB_CKS_RANGE_END
 uses CONFIG_LB_CKS_LOC
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_HAVE_LOW_TABLES
 uses CONFIG_MULTIBOOT
@@ -116,19 +116,19 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to provide ACPI support
 ##
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 default CONFIG_HAVE_LOW_TABLES=1
 default CONFIG_MULTIBOOT=0
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,8 +33,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,11 +8,11 @@
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select HAVE_HIGH_TABLES
 	select IOAPIC
 	select MEM_TRAIN_SEQ
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o
 obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -149,17 +149,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=0
+default CONFIG_GENERATE_ACPI_TABLES=0
 ## extra SSDT num
 default CONFIG_ACPI_SSDTX_NUM=3
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -33,8 +33,8 @@
 #needed by irq_tables and mptable and acpi_tables
 object get_bus_conf.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 	if CONFIG_USE_INIT

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -8,7 +8,8 @@
 	select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
 	select SOUTHBRIDGE_NVIDIA_MCP55
 	select SUPERIO_WINBOND_W83627HF
-	select PIRQ_TABLE
+	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,8 +23,8 @@
 
 #needed by irq_tables and mptable and acpi_tables
 obj-y += get_bus_conf.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o
 obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2912_fam10/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,9 +19,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_ACPI_SSDTX_NUM
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -151,17 +151,17 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=11
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ## ACPI tables will be included
-default CONFIG_HAVE_ACPI_TABLES=0
+default CONFIG_GENERATE_ACPI_TABLES=0
 ## extra SSDT num
 default CONFIG_ACPI_SSDTX_NUM=31
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4880/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4880/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4880/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -11,8 +11,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 	if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4880/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4880/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4880/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4880/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4880/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4880/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,8 +21,8 @@
 
 driver-y += mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4880/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4880/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4880/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -90,14 +90,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=22
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4882/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4882/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4882/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -11,8 +11,8 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 	if CONFIG_USE_INIT
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4882/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4882/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4882/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -9,6 +9,7 @@
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4882/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4882/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4882/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,8 +21,8 @@
 
 driver-y += mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 # This is part of the conversion to init-obj and away from included code.
 

Modified: trunk/coreboot-v2/src/mainboard/tyan/s4882/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s4882/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/tyan/s4882/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -90,14 +90,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=22
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/mainboard/via/epia/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,7 +13,7 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,7 +21,7 @@
 
 initobj-y += crt0.o
 obj-y += mainboard.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/via/epia/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -4,8 +4,8 @@
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
 uses CONFIG_TTYS0_LCS
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -35,7 +35,7 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
+uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -75,7 +75,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Build code to reset the motherboard from coreboot
@@ -93,7 +93,7 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=5
 #object irq_tables.o
 

Modified: trunk/coreboot-v2/src/mainboard/via/epia-cn/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-cn/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-cn/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,9 +25,9 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object dsdt.o
 	object acpi_tables.o

Modified: trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-cn/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,12 +21,12 @@
 
 initobj-y += crt0.o
 obj-y += mainboard.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,8 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -47,8 +47,8 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
@@ -73,13 +73,13 @@
 default CONFIG_PCI_ROM_RUN = 0
 default CONFIG_CONSOLE_VGA = 0
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 9
-default CONFIG_HAVE_ACPI_TABLES = 0
+default CONFIG_GENERATE_ACPI_TABLES = 0
 default CONFIG_HAVE_OPTION_TABLE = 1
 default CONFIG_ROM_IMAGE_SIZE = 64 * 1024
 default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -14,11 +14,11 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 object vgabios.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object dsdt.o
 	object acpi_tables.o

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,11 +22,11 @@
 initobj-y += crt0.o
 obj-y += mainboard.o
 obj-y += vgabios.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -27,8 +27,8 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
@@ -61,7 +61,7 @@
 ##
 ## no MP table
 ##
-default CONFIG_HAVE_MP_TABLE=0
+default CONFIG_GENERATE_MP_TABLE=0
 
 ##
 ## Use TSC for udelay.
@@ -77,14 +77,14 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=5
 
 
 ##
 ## Build code to load acpi tables
 ##
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 
 ##

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m700/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m700/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m700/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -25,9 +25,9 @@
 arch i386 end
 driver mainboard.o
 driver wakeup.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_ACPI_TABLES
   object fadt.o
   object dsdt.o
   # object ssdt.o

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m700/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m700/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m700/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -4,7 +4,6 @@
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_VX800
 	select SUPERIO_WINBOND_W83697HF
-	select HAVE_PIRQ_TABLE
 	select HAVE_ACPI_TABLES
 
 config MAINBOARD_DIR

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m700/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -22,12 +22,12 @@
 initobj-y += crt0.o
 obj-y += mainboard.o
 obj-y += wakeup.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m700/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,8 +18,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -46,8 +46,8 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_CROSS_COMPILE
 uses CC
 uses HOSTCC
@@ -112,14 +112,14 @@
 default CONFIG_PCI_ROM_RUN = 0
 default CONFIG_CONSOLE_VGA = 0
 default CONFIG_HAVE_FALLBACK_BOOT = 1
-default CONFIG_HAVE_MP_TABLE = 0
+default CONFIG_GENERATE_MP_TABLE = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_HARD_RESET = 0
 # TODO: There is an irq_tables.c file, should it be used?
-default CONFIG_HAVE_PIRQ_TABLE = 0
+default CONFIG_GENERATE_PIRQ_TABLE = 0
 default CONFIG_IRQ_SLOT_COUNT = 13
-default CONFIG_HAVE_ACPI_TABLES = 1
+default CONFIG_GENERATE_ACPI_TABLES = 1
 default CONFIG_HAVE_OPTION_TABLE = 1
 default CONFIG_ROM_IMAGE_SIZE = 128 * 1024
 default CONFIG_FALLBACK_SIZE = CONFIG_ROM_IMAGE_SIZE

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m700/acpi_tables.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m700/acpi_tables.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m700/acpi_tables.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -43,9 +43,9 @@
 
 /*
  * These four macros are copied from <arch/smp/mpspec.h>, I have to do this
- * since the "default CONFIG_HAVE_MP_TABLE = 0" in Options.lb, and also since
+ * since the "default CONFIG_GENERATE_MP_TABLE = 0" in Options.lb, and also since
  * mainboard/via/... have no mptable.c (so that I can not set
- * CONFIG_HAVE_MP_TABLE = 1) as many other mainboards.
+ * CONFIG_GENERATE_MP_TABLE = 1) as many other mainboards.
  * So I have to copy these four to here. acpi_fill_madt() needs this.
  */
 #define MP_IRQ_POLARITY_HIGH	0x1

Modified: trunk/coreboot-v2/src/mainboard/via/epia-n/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-n/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-n/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -34,13 +34,13 @@
 ##
 
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
 
 #object vgabios.o
 
-if CONFIG_HAVE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 #acpi_create_fadt is located in VT8237R code
 	makerule dsdt.c
 		depends "$(CONFIG_MAINBOARD)/dsdt.asl"

Modified: trunk/coreboot-v2/src/mainboard/via/epia-n/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-n/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-n/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,6 +6,7 @@
 	select SOUTHBRIDGE_VIA_VT8237R
 	select SUPERIO_WINBOND_W83697HF
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select EPIA_VT8237R_INIT
 	select HAVE_ACPI_TABLES
 

Modified: trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-n/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,11 +21,11 @@
 
 initobj-y += crt0.o
 obj-y += mainboard.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/via/epia-n/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-n/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-n/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,7 +19,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_HAVE_FAILOVER_BOOT
 uses CONFIG_USE_FAILOVER_IMAGE
 uses CONFIG_USE_FALLBACK_IMAGE
@@ -50,8 +50,8 @@
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
 uses CONFIG_SMP
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
@@ -85,13 +85,13 @@
 default CONFIG_USE_FAILOVER_IMAGE = 0
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_SMP = 1
-default CONFIG_HAVE_MP_TABLE = 1
+default CONFIG_GENERATE_MP_TABLE = 1
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 7
-default CONFIG_HAVE_ACPI_TABLES = 1
+default CONFIG_GENERATE_ACPI_TABLES = 1
 default CONFIG_HAVE_OPTION_TABLE = 1
 #default CONFIG_ROM_IMAGE_SIZE = 67 * 1024
 default CONFIG_ROM_IMAGE_SIZE = 128 * 1024

Modified: trunk/coreboot-v2/src/mainboard/via/epia-n/acpi_tables.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-n/acpi_tables.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/epia-n/acpi_tables.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -39,9 +39,9 @@
 
 /*
  * These four macros are copied from <arch/smp/mpspec.h>, I have to do this
- * since the "default CONFIG_HAVE_MP_TABLE = 0" in Options.lb, and also since
+ * since the "default CONFIG_GENERATE_MP_TABLE = 0" in Options.lb, and also since
  * mainboard/via/... have no mptable.c (so that I can not set
- * CONFIG_HAVE_MP_TABLE = 1) as many other mainboards.
+ * CONFIG_GENERATE_MP_TABLE = 1) as many other mainboards.
  * So I have to copy these four to here. acpi_fill_madt() needs this.
  */
 #define MP_IRQ_POLARITY_DEFAULT	0x0

Modified: trunk/coreboot-v2/src/mainboard/via/pc2500e/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/pc2500e/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/pc2500e/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,9 +24,9 @@
 
 arch i386 end
 driver mainboard.o
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object dsdt.o
 	object acpi_tables.o

Modified: trunk/coreboot-v2/src/mainboard/via/pc2500e/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/pc2500e/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/pc2500e/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,6 +6,7 @@
 	select SOUTHBRIDGE_VIA_VT8237R
 	select SUPERIO_ITE_IT8716F
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 
 config MAINBOARD_DIR
 	string

Modified: trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/pc2500e/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -21,12 +21,12 @@
 
 initobj-y += crt0.o
 obj-y += mainboard.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 
 ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
 ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds

Modified: trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,8 +19,8 @@
 ##
 
 uses CONFIG_SMP
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_HARD_RESET
@@ -48,8 +48,8 @@
 uses CONFIG_RAMBASE
 uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
@@ -79,13 +79,13 @@
 default CONFIG_CONSOLE_VGA = 0
 default CONFIG_HAVE_FALLBACK_BOOT = 1
 default CONFIG_SMP = 1
-default CONFIG_HAVE_MP_TABLE = 1
+default CONFIG_GENERATE_MP_TABLE = 1
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_HARD_RESET = 0
-default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_GENERATE_PIRQ_TABLE = 1
 default CONFIG_IRQ_SLOT_COUNT = 10
-default CONFIG_HAVE_ACPI_TABLES = 0
+default CONFIG_GENERATE_ACPI_TABLES = 0
 default CONFIG_HAVE_OPTION_TABLE = 1
 default CONFIG_USE_FALLBACK_IMAGE = 1
 default CONFIG_MAINBOARD_VENDOR = "VIA"

Modified: trunk/coreboot-v2/src/mainboard/via/vt8454c/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/vt8454c/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/vt8454c/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -35,15 +35,15 @@
 
 driver mainboard.o
 
-if CONFIG_HAVE_MP_TABLE 
+if CONFIG_GENERATE_MP_TABLE 
 	object mptable.o 
 end
 
-if CONFIG_HAVE_PIRQ_TABLE 
+if CONFIG_GENERATE_PIRQ_TABLE 
 	object irq_tables.o 
 end
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object fadt.o
 	object acpi_tables.o
 	makerule dsdt.c

Modified: trunk/coreboot-v2/src/mainboard/via/vt8454c/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/vt8454c/Kconfig	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/vt8454c/Kconfig	2009-10-15 13:35:47 UTC (rev 4778)
@@ -6,6 +6,7 @@
 #	select SOUTHBRIDGE_INTEL_I82801GX
 	select SUPERIO_VIA_VT1211
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 #	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select HAVE_ACPI_TABLES

Modified: trunk/coreboot-v2/src/mainboard/via/vt8454c/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/vt8454c/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/vt8454c/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,11 +19,11 @@
 
 driver-y += mainboard.o
 
-obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o
-obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o
+obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
+obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
 
 initobj-y += crt0.o
 # FIXME in $(top)/Makefile

Modified: trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,10 +19,10 @@
 ## MA 02110-1301 USA
 ##
 
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_IRQ_SLOT_COUNT
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_USE_OPTION_TABLE
 uses CONFIG_HAVE_LOW_TABLES
@@ -118,19 +118,19 @@
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=1
+default CONFIG_GENERATE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
 ## Useful for specifying IRQ routing values
 ##
-default CONFIG_HAVE_MP_TABLE=1
+default CONFIG_GENERATE_MP_TABLE=1
 
 ##
 ## Build code to load acpi tables
 ##
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table

Modified: trunk/coreboot-v2/src/northbridge/amd/amdfam10/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdfam10/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/amdfam10/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,18 +18,18 @@
 #
 
 uses CONFIG_AGP_APERTURE_SIZE
-uses CONFIG_HAVE_ACPI_TABLES
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 default CONFIG_AGP_APERTURE_SIZE=0x4000000
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 config chip.h
 
 driver northbridge.o
 driver misc_control.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object amdfam10_acpi.o
 	makerule ssdt.c
 		depends "$(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl"

Modified: trunk/coreboot-v2/src/northbridge/amd/amdfam10/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdfam10/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/amdfam10/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,13 +1,13 @@
 driver-y += northbridge.o
 driver-y += misc_control.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += amdfam10_acpi.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr1.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr2.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr3.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr4.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr5.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.o
 
 obj-y += get_pci1234.o
 

Modified: trunk/coreboot-v2/src/northbridge/amd/amdfam10/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdfam10/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/amdfam10/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -877,7 +877,7 @@
 
 #endif
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -1052,7 +1052,7 @@
 					ram_resource(dev, (idx | i), basek, pre_sizek);
 					idx += 0x10;
 					sizek -= pre_sizek;
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 					if (i==0 && high_tables_base==0) {
 					/* Leave some space for ACPI, PIRQ and MP tables */
 						high_tables_base = (mmio_basek - HIGH_TABLES_SIZE) * 1024;
@@ -1085,7 +1085,7 @@
 		}
 		ram_resource(dev, (idx | i), basek, sizek);
 		idx += 0x10;
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		printk_debug("%d: mmio_basek=%08lx, basek=%08x, limitk=%08x\n",
 			     i, mmio_basek, basek, limitk);
 		if (i==0 && high_tables_base==0) {

Modified: trunk/coreboot-v2/src/northbridge/amd/amdk8/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdk8/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/amdk8/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,10 +1,10 @@
 uses CONFIG_AGP_APERTURE_SIZE
-uses CONFIG_HAVE_ACPI_TABLES
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 uses CONFIG_K8_REV_F_SUPPORT
 
 default CONFIG_AGP_APERTURE_SIZE=0x4000000
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 config chip.h
 
@@ -30,7 +30,7 @@
 end
 
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object amdk8_acpi.o
 end
 

Modified: trunk/coreboot-v2/src/northbridge/amd/amdk8/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdk8/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/amdk8/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
 driver-y += northbridge.o
 driver-y += misc_control.o
 obj-y += get_sblk_pci1234.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += amdk8_acpi.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdk8_acpi.o
 
 # Not sure what to do with these yet. How did raminit_test even work?
 # Should be a target in -y form.

Modified: trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/amdk8/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -836,7 +836,7 @@
 }
 #endif
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -1014,7 +1014,7 @@
 					ram_resource(dev, (idx | i), basek, pre_sizek);
 					idx += 0x10;
 					sizek -= pre_sizek;
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 					if (i==0 && high_tables_base==0) {
 					/* Leave some space for ACPI, PIRQ and MP tables */
 						high_tables_base = (mmio_basek - HIGH_TABLES_SIZE) * 1024;
@@ -1048,7 +1048,7 @@
 		if (sizek)
 			ram_resource(dev, (idx | i), basek, sizek);
 		idx += 0x10;
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		printk_debug("%d: mmio_basek=%08lx, basek=%08x, limitk=%08x\n",
 			     i, mmio_basek, basek, limitk);
 		if (i==0 && high_tables_base==0) {

Modified: trunk/coreboot-v2/src/northbridge/amd/gx1/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/gx1/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/gx1/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,4 +1,4 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 config chip.h
 driver northbridge.o
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/amd/gx1/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/gx1/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/gx1/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -105,7 +105,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -153,7 +153,7 @@
 			tolmk = tomk;
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/amd/gx2/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/gx2/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/gx2/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 config chip.h
 driver northbridge.o
 object northbridgeinit.o
 object chipsetinit.o
 object grphinit.o
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/amd/gx2/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/gx2/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/gx2/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -476,7 +476,7 @@
 
 void chipsetInit (void);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -503,7 +503,7 @@
 		dev->ops = &pci_domain_ops;
 		pci_set_method(dev);
 		tomk = ((sizeram() - VIDEO_MB) * 1024) - SMM_SIZE;
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/amd/lx/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/lx/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/lx/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,6 +1,6 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 config chip.h
 driver northbridge.o
 object northbridgeinit.o
 object grphinit.o
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/amd/lx/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/amd/lx/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/amd/lx/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -395,7 +395,7 @@
 	    IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -416,7 +416,7 @@
 		ram_resource(dev, idx++, 0, 640);
 		ram_resource(dev, idx++, 1024, tomk - 1024);	// Systop - 1 MB -> KB
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/e7501/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/e7501/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/e7501/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 object northbridge.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/intel/e7501/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/e7501/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/e7501/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -48,7 +48,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -129,7 +129,7 @@
 				(remaplimitk + 64*1024) - remapbasek);
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/e7520/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/e7520/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/e7520/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,4 +1,4 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 driver northbridge.o
@@ -7,7 +7,7 @@
 driver pciexp_portb.o
 driver pciexp_portc.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 makerule raminit_test
 	depends "$(TOP)/src/northbridge/intel/e7520/raminit_test.c"

Modified: trunk/coreboot-v2/src/northbridge/intel/e7520/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/e7520/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/e7520/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -52,7 +52,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -145,7 +145,7 @@
 				(remaplimitk + 64*1024) - remapbasek);
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/e7525/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/e7525/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/e7525/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,4 +1,4 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 driver northbridge.o
@@ -7,7 +7,7 @@
 driver pciexp_portb.o
 driver pciexp_portc.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 makerule raminit_test
 	depends "$(TOP)/src/northbridge/intel/e7525/raminit_test.c"

Modified: trunk/coreboot-v2/src/northbridge/intel/e7525/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/e7525/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/e7525/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -52,7 +52,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -145,7 +145,7 @@
 				(remaplimitk + 64*1024) - remapbasek);
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/i3100/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i3100/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i3100/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
@@ -25,4 +25,4 @@
 driver pciexp_porta.o
 driver pciexp_porta_ep80579.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/intel/i3100/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i3100/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i3100/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -73,7 +73,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -166,7 +166,7 @@
 				(remaplimitk + 64*1024) - remapbasek);
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/i440bx/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i440bx/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i440bx/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,10 +18,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 driver northbridge.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/intel/i440bx/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i440bx/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i440bx/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -72,7 +72,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -113,7 +113,7 @@
 		ram_resource(dev, idx++, 0, 640);
 		ram_resource(dev, idx++, 768, tolmk - 768);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/i82810/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i82810/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i82810/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,10 +18,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 driver northbridge.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/intel/i82810/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i82810/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i82810/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -109,7 +109,7 @@
 /* MB */0, 8, 0, 16, 16, 24, 32, 32, 48, 64, 64, 96, 128, 128, 192, 256,
 };
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -172,7 +172,7 @@
 		ram_resource(dev, idx++, 0, 640);
 		ram_resource(dev, idx++, 768, tolmk - 768);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/i82830/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i82830/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i82830/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,11 +18,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 driver northbridge.o
 driver vga.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/intel/i82830/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i82830/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i82830/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -88,7 +88,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -130,7 +130,7 @@
 		ram_resource(dev, idx++, 0, 640);
 		ram_resource(dev, idx++, 1024, tolmk - 1024);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/i855gme/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i855gme/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i855gme/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 object northbridge.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/intel/i855gme/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i855gme/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i855gme/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -70,7 +70,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -129,7 +129,7 @@
 		/* ram_resource(dev, idx++, 1024, tolmk - 1024); */
 		ram_resource(dev, idx++, 768, tolmk - 768);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/i855pm/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i855pm/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i855pm/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 object northbridge.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/intel/i855pm/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i855pm/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i855pm/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -49,7 +49,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -97,7 +97,7 @@
 		ram_resource(dev, idx++, 0, 640);
 		ram_resource(dev, idx++, 768, tolmk - 768);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		/* Leave some space for ACPI, PIRQ and MP tables */
 		high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/intel/i945/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i945/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i945/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,9 +17,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 config chip.h
 

Modified: trunk/coreboot-v2/src/northbridge/intel/i945/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i945/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i945/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,4 +19,4 @@
 
 driver-y += northbridge.o
 driver-y += gma.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o

Modified: trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -126,7 +126,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -213,7 +213,7 @@
 
 	assign_resources(&dev->link[0]);
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 	/* Leave some space for ACPI, PIRQ and MP tables */
 	high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
 	high_tables_size = HIGH_TABLES_SIZE * 1024;

Modified: trunk/coreboot-v2/src/northbridge/via/cn400/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn400/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/cn400/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 uses CONFIG_IOAPIC
 
 config chip.h
@@ -30,4 +30,4 @@
 driver vga.o
 driver vlink.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/via/cn400/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn400/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/cn400/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -218,7 +218,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
 #define HIGH_TABLES_SIZE 64
 extern uint64_t high_tables_base, high_tables_size;
@@ -250,7 +250,7 @@
 			tolmk = tomk;
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 		/* Locate the High Tables at the Top of Low Memory below the Video RAM */
 		high_tables_base = (uint64_t) (tolmk - (CONFIG_VIDEO_MB *1024) - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = (uint64_t) HIGH_TABLES_SIZE* 1024;

Modified: trunk/coreboot-v2/src/northbridge/via/cn700/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
@@ -28,4 +28,4 @@
 driver agp.o
 driver vga.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -142,7 +142,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
 #define HIGH_TABLES_SIZE 64
 extern uint64_t high_tables_base, high_tables_size;
@@ -185,7 +185,7 @@
 			tolmk = tomk;
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 		high_tables_base = (tolmk - CONFIG_VIDEO_MB * 1024 - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE * 1024;
 		printk_debug("tom: %lx, high_tables_base: %llx, high_tables_size: %llx\n", tomk*1024, high_tables_base, high_tables_size);

Modified: trunk/coreboot-v2/src/northbridge/via/cx700/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cx700/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/cx700/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -15,7 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
@@ -28,4 +28,4 @@
 driver cx700_sata.o
 driver cx700_vga.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/via/cx700/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cx700/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/cx700/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -72,7 +72,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
 #define HIGH_TABLES_SIZE 64
 extern uint64_t high_tables_base, high_tables_size;
@@ -116,7 +116,7 @@
 		tolmk -= 1024;	// TOP 1M SM Memory
 	}
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 	high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 	high_tables_size = HIGH_TABLES_SIZE* 1024;
 	printk_debug("tom: %lx, high_tables_base: %llx, high_tables_size: %llx\n", tomk*1024, high_tables_base, high_tables_size);

Modified: trunk/coreboot-v2/src/northbridge/via/vt8601/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/vt8601/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/vt8601/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 driver northbridge.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/via/vt8601/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/vt8601/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/vt8601/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -84,7 +84,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
 #define HIGH_TABLES_SIZE 64
 extern uint64_t high_tables_base, high_tables_size;
@@ -130,7 +130,7 @@
 			tolmk = tomk;
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 		high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE* 1024;
 		printk_debug("tom: %lx, high_tables_base: %llx, high_tables_size: %llx\n", tomk*1024, high_tables_base, high_tables_size);

Modified: trunk/coreboot-v2/src/northbridge/via/vt8623/Config.lb
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/vt8623/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/vt8623/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,7 +1,7 @@
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 config chip.h
 
 driver northbridge.o
 
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1

Modified: trunk/coreboot-v2/src/northbridge/via/vt8623/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/vt8623/northbridge.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/northbridge/via/vt8623/northbridge.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -229,7 +229,7 @@
 	return tolm;
 }
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 /* maximum size of high tables in KB */
 #define HIGH_TABLES_SIZE 64
 extern uint64_t high_tables_base, high_tables_size;
@@ -275,7 +275,7 @@
 			tolmk = tomk;
 		}
 
-#if CONFIG_HAVE_HIGH_TABLES == 1
+#if CONFIG_WRITE_HIGH_TABLES == 1
 		high_tables_base = (tolmk - HIGH_TABLES_SIZE) * 1024;
 		high_tables_size = HIGH_TABLES_SIZE* 1024;
 		printk_debug("tom: %lx, high_tables_base: %llx, high_tables_size: %llx\n", tomk*1024, high_tables_base, high_tables_size);

Modified: trunk/coreboot-v2/src/southbridge/amd/amd8111/amd8111_acpi.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/amd8111/amd8111_acpi.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/amd/amd8111/amd8111_acpi.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -66,7 +66,7 @@
 	return do_smbus_write_byte(res->base, device, address, val);
 }
 
-#if CONFIG_HAVE_ACPI_TABLES == 1
+#if CONFIG_GENERATE_ACPI_TABLES == 1
 unsigned pm_base;
 #endif
 
@@ -140,7 +140,7 @@
 				(on*12)+(on>>1),(on&1)*5);
 	}
 
-#if CONFIG_HAVE_ACPI_TABLES == 1
+#if CONFIG_GENERATE_ACPI_TABLES == 1
 	pm_base = pci_read_config16(dev, 0x58) & 0xff00;
 	printk_debug("pm_base: 0x%04x\n",pm_base);
 #endif

Modified: trunk/coreboot-v2/src/southbridge/amd/cs5530/cs5530_pirq.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/cs5530/cs5530_pirq.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/amd/cs5530/cs5530_pirq.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,7 +23,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
-#if (CONFIG_PIRQ_ROUTE==1 && CONFIG_HAVE_PIRQ_TABLE==1)
+#if (CONFIG_PIRQ_ROUTE==1 && CONFIG_GENERATE_PIRQ_TABLE==1)
 void pirq_assign_irqs(const unsigned char pIntAtoD[4])
 {
 	device_t pdev;

Modified: trunk/coreboot-v2/src/southbridge/amd/cs5536/cs5536_pirq.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/cs5536/cs5536_pirq.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/amd/cs5536/cs5536_pirq.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -23,7 +23,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
-#if (CONFIG_PIRQ_ROUTE==1 && CONFIG_HAVE_PIRQ_TABLE==1)
+#if (CONFIG_PIRQ_ROUTE==1 && CONFIG_GENERATE_PIRQ_TABLE==1)
 void pirq_assign_irqs(const unsigned char pIntAtoD[4])
 {
 	device_t pdev;

Modified: trunk/coreboot-v2/src/southbridge/nvidia/ck804/Config.lb
===================================================================
--- trunk/coreboot-v2/src/southbridge/nvidia/ck804/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/nvidia/ck804/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -1,4 +1,4 @@
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 
 config chip.h
 driver ck804.o
@@ -15,6 +15,6 @@
 driver ck804_ht.o
 object ck804_reset.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object ck804_fadt.o
 end

Modified: trunk/coreboot-v2/src/southbridge/nvidia/ck804/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/southbridge/nvidia/ck804/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/nvidia/ck804/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -13,4 +13,4 @@
 
 obj-y += ck804_reset.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += ck804_fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ck804_fadt.o

Modified: trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Config.lb
===================================================================
--- trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -19,7 +19,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ## 
 
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 
 config chip.h
 driver mcp55.o
@@ -35,6 +35,6 @@
 driver mcp55_pcie.o
 driver mcp55_ht.o
 object mcp55_reset.o
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object mcp55_fadt.o
 end

Modified: trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/nvidia/mcp55/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -11,6 +11,6 @@
 driver-y += mcp55_usb2.o
 driver-y += mcp55_usb.o
 
-driver-$(CONFIG_HAVE_ACPI_TABLES) += mcp55_fadt.o
+driver-$(CONFIG_GENERATE_ACPI_TABLES) += mcp55_fadt.o
 
 obj-y += mcp55_reset.o

Modified: trunk/coreboot-v2/src/southbridge/nvidia/mcp55/mcp55_smbus.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/nvidia/mcp55/mcp55_smbus.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/nvidia/mcp55/mcp55_smbus.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -94,7 +94,7 @@
 	.write_byte	= lsmbus_write_byte,
 };
 
-#if CONFIG_HAVE_ACPI_TABLES == 1
+#if CONFIG_GENERATE_ACPI_TABLES == 1
 unsigned pm_base;
 #endif
 
@@ -115,7 +115,7 @@
 
 static void mcp55_sm_init(device_t dev)
 {
-#if CONFIG_HAVE_ACPI_TABLES == 1
+#if CONFIG_GENERATE_ACPI_TABLES == 1
 	struct resource *res;
 
 	res = find_resource(dev, 0x60);

Modified: trunk/coreboot-v2/src/southbridge/via/k8t890/k8t890_dram.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/via/k8t890/k8t890_dram.c	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/via/k8t890/k8t890_dram.c	2009-10-15 13:35:47 UTC (rev 4778)
@@ -92,7 +92,7 @@
 		(proposed_base < ((uint64_t) 0xffffffff) )) {
 		resmax = res;
 	}
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 /* in arch/i386/boot/tables.c */
 extern uint64_t high_tables_base, high_tables_size;
 

Modified: trunk/coreboot-v2/src/southbridge/via/vt8237r/Config.lb
===================================================================
--- trunk/coreboot-v2/src/southbridge/via/vt8237r/Config.lb	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/via/vt8237r/Config.lb	2009-10-15 13:35:47 UTC (rev 4778)
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
 
 config chip.h
 
@@ -28,6 +28,6 @@
 driver vt8237r_sata.o
 driver vt8237r_usb.o
 driver vt8237r_nic.o
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object vt8237_fadt.o
 end

Modified: trunk/coreboot-v2/src/southbridge/via/vt8237r/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/southbridge/via/vt8237r/Makefile.inc	2009-10-15 13:16:40 UTC (rev 4777)
+++ trunk/coreboot-v2/src/southbridge/via/vt8237r/Makefile.inc	2009-10-15 13:35:47 UTC (rev 4778)
@@ -24,4 +24,4 @@
 driver-y += vt8237r_sata.o
 driver-y += vt8237r_usb.o
 driver-y += vt8237r_nic.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += vt8237_fadt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += vt8237_fadt.o





More information about the coreboot mailing list