diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-10-15 13:35:47 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-10-15 13:35:47 +0000 |
| commit | b8e2027be817159d4606f991475b59fc36b0242d (patch) | |
| tree | 1ab06caebfc37dbff884d916c43cca6b9562ae85 | |
| parent | 45b811b13552a94af4713b77613d377561e4ef26 (diff) | |
| download | coreboot-staging-b8e2027be817159d4606f991475b59fc36b0242d.zip coreboot-staging-b8e2027be817159d4606f991475b59fc36b0242d.tar.gz | |
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@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4778 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
424 files changed, 1215 insertions, 1148 deletions
diff --git a/src/Kconfig b/src/Kconfig index 4e365c6..241386d 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -237,31 +237,47 @@ config GFXUMA # # 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 diff --git a/src/arch/i386/boot/Config.lb b/src/arch/i386/boot/Config.lb index 9c57692..b365cf9 100644 --- a/src/arch/i386/boot/Config.lb +++ b/src/arch/i386/boot/Config.lb @@ -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 @@ if CONFIG_MULTIBOOT 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 diff --git a/src/arch/i386/boot/Makefile.inc b/src/arch/i386/boot/Makefile.inc index 0c31ef0..c785a6b 100644 --- a/src/arch/i386/boot/Makefile.inc +++ b/src/arch/i386/boot/Makefile.inc @@ -2,8 +2,8 @@ obj-y += boot.o 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 diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c index 6d59123..9aeb85c 100644 --- a/src/arch/i386/boot/coreboot_table.c +++ b/src/arch/i386/boot/coreboot_table.c @@ -436,7 +436,7 @@ static struct lb_memory *build_lb_mem(struct lb_header *head) 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 @@ unsigned long write_coreboot_table( 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 @@ unsigned long write_coreboot_table( 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, diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c index 0c47008..0d852c5 100644 --- a/src/arch/i386/boot/pirq_routing.c +++ b/src/arch/i386/boot/pirq_routing.c @@ -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 @@ static int verify_copy_pirq_routing_table(unsigned long addr) #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 @@ unsigned long copy_pirq_routing_table(unsigned long addr) } #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; diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c index 17338ef..b5f3316 100644 --- a/src/arch/i386/boot/tables.c +++ b/src/arch/i386/boot/tables.c @@ -104,7 +104,7 @@ struct lb_memory *write_tables(void) 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 @@ struct lb_memory *write_tables(void) #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 @@ struct lb_memory *write_tables(void) 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); diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h index 47a8a15..85b8445 100644 --- a/src/arch/i386/include/arch/acpi.h +++ b/src/arch/i386/include/arch/acpi.h @@ -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 @@ do { \ #define IO_APIC_ADDR 0xfec00000UL -#else // CONFIG_HAVE_ACPI_TABLES +#else // CONFIG_GENERATE_ACPI_TABLES #define write_acpi_tables(start) (start) diff --git a/src/arch/i386/include/arch/pirq_routing.h b/src/arch/i386/include/arch/pirq_routing.h index 15c616b..ecc2882 100644 --- a/src/arch/i386/include/arch/pirq_routing.h +++ b/src/arch/i386/include/arch/pirq_routing.h @@ -39,7 +39,7 @@ struct irq_routing_table { 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 diff --git a/src/arch/i386/smp/Config.lb b/src/arch/i386/smp/Config.lb index 18aa70a..cfbac7b 100644 --- a/src/arch/i386/smp/Config.lb +++ b/src/arch/i386/smp/Config.lb @@ -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 diff --git a/src/arch/i386/smp/Makefile.inc b/src/arch/i386/smp/Makefile.inc index ed8ab55..27e1291 100644 --- a/src/arch/i386/smp/Makefile.inc +++ b/src/arch/i386/smp/Makefile.inc @@ -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 diff --git a/src/arch/ppc/include/arch/pirq_routing.h b/src/arch/ppc/include/arch/pirq_routing.h index 00c9556..677ba65 100644 --- a/src/arch/ppc/include/arch/pirq_routing.h +++ b/src/arch/ppc/include/arch/pirq_routing.h @@ -39,13 +39,13 @@ struct irq_routing_table { 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) diff --git a/src/config/Options.lb b/src/config/Options.lb index 8822196..cd1dc76 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -601,7 +601,7 @@ define CONFIG_AP_IN_SIPI_WAIT 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 @@ end # 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 @@ define CONFIG_FAKE_SPDROM 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 @@ define CONFIG_HAVE_LOW_TABLES 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" diff --git a/src/cpu/emulation/qemu-x86/northbridge.c b/src/cpu/emulation/qemu-x86/northbridge.c index b45315e..7c3c180 100644 --- a/src/cpu/emulation/qemu-x86/northbridge.c +++ b/src/cpu/emulation/qemu-x86/northbridge.c @@ -48,7 +48,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void cpu_pci_domain_set_resources(device_t dev) 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; diff --git a/src/cpu/intel/speedstep/Makefile.inc b/src/cpu/intel/speedstep/Makefile.inc index 1c948af..501638e 100644 --- a/src/cpu/intel/speedstep/Makefile.inc +++ b/src/cpu/intel/speedstep/Makefile.inc @@ -1 +1 @@ -obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o diff --git a/src/mainboard/Makefile.romccboard.inc b/src/mainboard/Makefile.romccboard.inc index 71ad740..fc25fda 100644 --- a/src/mainboard/Makefile.romccboard.inc +++ b/src/mainboard/Makefile.romccboard.inc @@ -44,8 +44,8 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds 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 diff --git a/src/mainboard/a-trend/atc-6220/Config.lb b/src/mainboard/a-trend/atc-6220/Config.lb index 1d86352..b50b516 100644 --- a/src/mainboard/a-trend/atc-6220/Config.lb +++ b/src/mainboard/a-trend/atc-6220/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/a-trend/atc-6220/Options.lb b/src/mainboard/a-trend/atc-6220/Options.lb index 1f8e03b..6884393 100644 --- a/src/mainboard/a-trend/atc-6220/Options.lb +++ b/src/mainboard/a-trend/atc-6220/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/a-trend/atc-6240/Config.lb b/src/mainboard/a-trend/atc-6240/Config.lb index fdb4b0b..420b0e1 100644 --- a/src/mainboard/a-trend/atc-6240/Config.lb +++ b/src/mainboard/a-trend/atc-6240/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/a-trend/atc-6240/Options.lb b/src/mainboard/a-trend/atc-6240/Options.lb index 98b3a8c..7930819 100644 --- a/src/mainboard/a-trend/atc-6240/Options.lb +++ b/src/mainboard/a-trend/atc-6240/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/abit/be6-ii_v2_0/Config.lb b/src/mainboard/abit/be6-ii_v2_0/Config.lb index 86ebdc4..5c8f8d0 100644 --- a/src/mainboard/abit/be6-ii_v2_0/Config.lb +++ b/src/mainboard/abit/be6-ii_v2_0/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/abit/be6-ii_v2_0/Options.lb b/src/mainboard/abit/be6-ii_v2_0/Options.lb index 23b83f2..c415fd2 100644 --- a/src/mainboard/abit/be6-ii_v2_0/Options.lb +++ b/src/mainboard/abit/be6-ii_v2_0/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/advantech/pcm-5820/Config.lb b/src/mainboard/advantech/pcm-5820/Config.lb index 3437d74..96349a6 100644 --- a/src/mainboard/advantech/pcm-5820/Config.lb +++ b/src/mainboard/advantech/pcm-5820/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end makerule ./failover.E diff --git a/src/mainboard/advantech/pcm-5820/Options.lb b/src/mainboard/advantech/pcm-5820/Options.lb index 6fbde48..684e4dc 100644 --- a/src/mainboard/advantech/pcm-5820/Options.lb +++ b/src/mainboard/advantech/pcm-5820/Options.lb @@ -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_SPLASH_GRAPHIC = 1 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 diff --git a/src/mainboard/amd/db800/Config.lb b/src/mainboard/amd/db800/Config.lb index c82c664..23da49e 100644 --- a/src/mainboard/amd/db800/Config.lb +++ b/src/mainboard/amd/db800/Config.lb @@ -14,7 +14,7 @@ arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end diff --git a/src/mainboard/amd/db800/Makefile.inc b/src/mainboard/amd/db800/Makefile.inc index eac4755..af94794 100644 --- a/src/mainboard/amd/db800/Makefile.inc +++ b/src/mainboard/amd/db800/Makefile.inc @@ -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. diff --git a/src/mainboard/amd/db800/Options.lb b/src/mainboard/amd/db800/Options.lb index 5452ad9..236dd05 100644 --- a/src/mainboard/amd/db800/Options.lb +++ b/src/mainboard/amd/db800/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/amd/dbm690t/Config.lb b/src/mainboard/amd/dbm690t/Config.lb index 9a3b6d9..68255ee 100644 --- a/src/mainboard/amd/dbm690t/Config.lb +++ b/src/mainboard/amd/dbm690t/Config.lb @@ -33,13 +33,13 @@ driver mainboard.o #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 diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index 75f9692..f497bba 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -9,6 +9,7 @@ config BOARD_AMD_DBM690T 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 diff --git a/src/mainboard/amd/dbm690t/Makefile.inc b/src/mainboard/amd/dbm690t/Makefile.inc index 0a2460d..317f9ca 100644 --- a/src/mainboard/amd/dbm690t/Makefile.inc +++ b/src/mainboard/amd/dbm690t/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/amd/dbm690t/Options.lb b/src/mainboard/amd/dbm690t/Options.lb index 467c91e..92378eb 100644 --- a/src/mainboard/amd/dbm690t/Options.lb +++ b/src/mainboard/amd/dbm690t/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/amd/dbm690t/mptable.c b/src/mainboard/amd/dbm690t/mptable.c index daaf4d2..4c71776 100644 --- a/src/mainboard/amd/dbm690t/mptable.c +++ b/src/mainboard/amd/dbm690t/mptable.c @@ -142,7 +142,7 @@ void *smp_write_config_table(void *v) /* 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 diff --git a/src/mainboard/amd/norwich/Config.lb b/src/mainboard/amd/norwich/Config.lb index a92120e..c49caf9 100644 --- a/src/mainboard/amd/norwich/Config.lb +++ b/src/mainboard/amd/norwich/Config.lb @@ -14,7 +14,7 @@ arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end diff --git a/src/mainboard/amd/norwich/Makefile.inc b/src/mainboard/amd/norwich/Makefile.inc index eac4755..af94794 100644 --- a/src/mainboard/amd/norwich/Makefile.inc +++ b/src/mainboard/amd/norwich/Makefile.inc @@ -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. diff --git a/src/mainboard/amd/norwich/Options.lb b/src/mainboard/amd/norwich/Options.lb index f0ec118..0ca2026 100644 --- a/src/mainboard/amd/norwich/Options.lb +++ b/src/mainboard/amd/norwich/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/amd/pistachio/Config.lb b/src/mainboard/amd/pistachio/Config.lb index 33079a2..e0458d3 100644 --- a/src/mainboard/amd/pistachio/Config.lb +++ b/src/mainboard/amd/pistachio/Config.lb @@ -33,13 +33,13 @@ driver mainboard.o #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 diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig index 170d121..c8adde9 100644 --- a/src/mainboard/amd/pistachio/Kconfig +++ b/src/mainboard/amd/pistachio/Kconfig @@ -8,6 +8,7 @@ config BOARD_AMD_PISTACHIO 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 diff --git a/src/mainboard/amd/pistachio/Makefile.inc b/src/mainboard/amd/pistachio/Makefile.inc index 0a2460d..317f9ca 100644 --- a/src/mainboard/amd/pistachio/Makefile.inc +++ b/src/mainboard/amd/pistachio/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/amd/pistachio/Options.lb b/src/mainboard/amd/pistachio/Options.lb index 3260e65..0082151 100644 --- a/src/mainboard/amd/pistachio/Options.lb +++ b/src/mainboard/amd/pistachio/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/amd/pistachio/mptable.c b/src/mainboard/amd/pistachio/mptable.c index 23b38ca..80ff410 100644 --- a/src/mainboard/amd/pistachio/mptable.c +++ b/src/mainboard/amd/pistachio/mptable.c @@ -142,7 +142,7 @@ void *smp_write_config_table(void *v) /* 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 diff --git a/src/mainboard/amd/rumba/Config.lb b/src/mainboard/amd/rumba/Config.lb index 466703f..56011ad 100644 --- a/src/mainboard/amd/rumba/Config.lb +++ b/src/mainboard/amd/rumba/Config.lb @@ -14,7 +14,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 ## diff --git a/src/mainboard/amd/rumba/Options.lb b/src/mainboard/amd/rumba/Options.lb index a6549dc..e6a9b48 100644 --- a/src/mainboard/amd/rumba/Options.lb +++ b/src/mainboard/amd/rumba/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/amd/serengeti_cheetah/Config.lb b/src/mainboard/amd/serengeti_cheetah/Config.lb index 80d6318..1e2f1b2 100644 --- a/src/mainboard/amd/serengeti_cheetah/Config.lb +++ b/src/mainboard/amd/serengeti_cheetah/Config.lb @@ -15,15 +15,15 @@ driver mainboard.o #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 #end -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o object fadt.o makerule dsdt.c diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index dd2b105..287d3d2 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -9,6 +9,7 @@ config BOARD_AMD_SERENGETI_CHEETAH 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 diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index 19e58bd..64797b1 100644 --- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # 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 diff --git a/src/mainboard/amd/serengeti_cheetah/Options.lb b/src/mainboard/amd/serengeti_cheetah/Options.lb index 9338e50..dc57feb 100644 --- a/src/mainboard/amd/serengeti_cheetah/Options.lb +++ b/src/mainboard/amd/serengeti_cheetah/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb index 456ad0e..da52d4d 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Config.lb @@ -33,15 +33,15 @@ driver mainboard.o #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 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index 1feca96..df024f5 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -9,6 +9,7 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10 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 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc index 0966e03..617750e 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc @@ -23,17 +23,17 @@ driver-y += mainboard.o # 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 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb index 9867223..a5ba422 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb index 89174f1..276b470 100644 --- a/src/mainboard/arima/hdama/Config.lb +++ b/src/mainboard/arima/hdama/Config.lb @@ -13,8 +13,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 if CONFIG_USE_INIT diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig index 25a277a..7c2e6c2 100644 --- a/src/mainboard/arima/hdama/Kconfig +++ b/src/mainboard/arima/hdama/Kconfig @@ -9,6 +9,7 @@ config BOARD_ARIMA_HDAMA 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 diff --git a/src/mainboard/arima/hdama/Makefile.inc b/src/mainboard/arima/hdama/Makefile.inc index 5ad2d55..9727e00 100644 --- a/src/mainboard/arima/hdama/Makefile.inc +++ b/src/mainboard/arima/hdama/Makefile.inc @@ -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. diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb index b88764e..c047282 100644 --- a/src/mainboard/arima/hdama/Options.lb +++ b/src/mainboard/arima/hdama/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/artecgroup/dbe61/Config.lb b/src/mainboard/artecgroup/dbe61/Config.lb index 41c77e0..0288c98 100644 --- a/src/mainboard/artecgroup/dbe61/Config.lb +++ b/src/mainboard/artecgroup/dbe61/Config.lb @@ -14,7 +14,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 #compile cache_as_ram.c to auto.inc diff --git a/src/mainboard/artecgroup/dbe61/Makefile.inc b/src/mainboard/artecgroup/dbe61/Makefile.inc index 90b154a..4a26b97 100644 --- a/src/mainboard/artecgroup/dbe61/Makefile.inc +++ b/src/mainboard/artecgroup/dbe61/Makefile.inc @@ -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. diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb index 07325a1..3aebf74 100644 --- a/src/mainboard/artecgroup/dbe61/Options.lb +++ b/src/mainboard/artecgroup/dbe61/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/asi/mb_5blgp/Config.lb b/src/mainboard/asi/mb_5blgp/Config.lb index 08010fa..1049f33 100644 --- a/src/mainboard/asi/mb_5blgp/Config.lb +++ b/src/mainboard/asi/mb_5blgp/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end makerule ./failover.E diff --git a/src/mainboard/asi/mb_5blgp/Options.lb b/src/mainboard/asi/mb_5blgp/Options.lb index 968ec2f..7865fa3 100644 --- a/src/mainboard/asi/mb_5blgp/Options.lb +++ b/src/mainboard/asi/mb_5blgp/Options.lb @@ -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_SPLASH_GRAPHIC = 1 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 diff --git a/src/mainboard/asi/mb_5blmp/Config.lb b/src/mainboard/asi/mb_5blmp/Config.lb index f0008f7..7a06509 100644 --- a/src/mainboard/asi/mb_5blmp/Config.lb +++ b/src/mainboard/asi/mb_5blmp/Config.lb @@ -14,7 +14,7 @@ arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end diff --git a/src/mainboard/asi/mb_5blmp/Options.lb b/src/mainboard/asi/mb_5blmp/Options.lb index dbc0de1..571ec06 100644 --- a/src/mainboard/asi/mb_5blmp/Options.lb +++ b/src/mainboard/asi/mb_5blmp/Options.lb @@ -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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/asus/a8n_e/Config.lb b/src/mainboard/asus/a8n_e/Config.lb index 72380d9..b499514 100644 --- a/src/mainboard/asus/a8n_e/Config.lb +++ b/src/mainboard/asus/a8n_e/Config.lb @@ -29,8 +29,8 @@ arch i386 end 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" diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig index b495ad5..08321ae 100644 --- a/src/mainboard/asus/a8n_e/Kconfig +++ b/src/mainboard/asus/a8n_e/Kconfig @@ -8,6 +8,7 @@ config BOARD_ASUS_A8N_E 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 diff --git a/src/mainboard/asus/a8n_e/Makefile.inc b/src/mainboard/asus/a8n_e/Makefile.inc index bfba668..6bbef3c 100644 --- a/src/mainboard/asus/a8n_e/Makefile.inc +++ b/src/mainboard/asus/a8n_e/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/asus/a8n_e/Options.lb b/src/mainboard/asus/a8n_e/Options.lb index 71607d8..50a1584 100644 --- a/src/mainboard/asus/a8n_e/Options.lb +++ b/src/mainboard/asus/a8n_e/Options.lb @@ -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_FAILOVER_SIZE = 4 * 1024 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 diff --git a/src/mainboard/asus/a8v-e_se/Config.lb b/src/mainboard/asus/a8v-e_se/Config.lb index 242c104..0b10bb9 100644 --- a/src/mainboard/asus/a8v-e_se/Config.lb +++ b/src/mainboard/asus/a8v-e_se/Config.lb @@ -28,7 +28,7 @@ default CONFIG_ROM_PAYLOAD = 1 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 @@ if CONFIG_HAVE_ACPI_TABLES 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 diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig index bf23b81..b25a8b6 100644 --- a/src/mainboard/asus/a8v-e_se/Kconfig +++ b/src/mainboard/asus/a8v-e_se/Kconfig @@ -12,6 +12,7 @@ config BOARD_ASUS_A8V_E_SE select HAVE_HARD_RESET select IOAPIC select HAVE_ACPI_TABLES + select HAVE_MP_TABLE config MAINBOARD_DIR string diff --git a/src/mainboard/asus/a8v-e_se/Makefile.inc b/src/mainboard/asus/a8v-e_se/Makefile.inc index 77348fd..ab30fbc 100644 --- a/src/mainboard/asus/a8v-e_se/Makefile.inc +++ b/src/mainboard/asus/a8v-e_se/Makefile.inc @@ -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. diff --git a/src/mainboard/asus/a8v-e_se/Options.lb b/src/mainboard/asus/a8v-e_se/Options.lb index cecf439..bdf0972 100644 --- a/src/mainboard/asus/a8v-e_se/Options.lb +++ b/src/mainboard/asus/a8v-e_se/Options.lb @@ -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_STACK_SIZE 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_ROM_SIZE = 512 * 1024 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_SMP = 1 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 diff --git a/src/mainboard/asus/m2v-mx_se/Config.lb b/src/mainboard/asus/m2v-mx_se/Config.lb index c7f7d6e..908d1b7 100644 --- a/src/mainboard/asus/m2v-mx_se/Config.lb +++ b/src/mainboard/asus/m2v-mx_se/Config.lb @@ -27,7 +27,7 @@ include /config/nofailovercalculation.lb 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" diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc index 24b2680..4ae1e1f 100644 --- a/src/mainboard/asus/m2v-mx_se/Makefile.inc +++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc @@ -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. diff --git a/src/mainboard/asus/m2v-mx_se/Options.lb b/src/mainboard/asus/m2v-mx_se/Options.lb index c8e6c98..94e57f9 100644 --- a/src/mainboard/asus/m2v-mx_se/Options.lb +++ b/src/mainboard/asus/m2v-mx_se/Options.lb @@ -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_STACK_SIZE 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 @@ uses CONFIG_USE_PRINTK_IN_CAR 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_SMP = 1 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 diff --git a/src/mainboard/asus/mew-am/Config.lb b/src/mainboard/asus/mew-am/Config.lb index c648683..2126488 100644 --- a/src/mainboard/asus/mew-am/Config.lb +++ b/src/mainboard/asus/mew-am/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end makerule ./failover.E diff --git a/src/mainboard/asus/mew-am/Options.lb b/src/mainboard/asus/mew-am/Options.lb index ce98c2f..c62bf48 100644 --- a/src/mainboard/asus/mew-am/Options.lb +++ b/src/mainboard/asus/mew-am/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/asus/mew-vm/Config.lb b/src/mainboard/asus/mew-vm/Config.lb index 60f4e15..4f748b7 100644 --- a/src/mainboard/asus/mew-vm/Config.lb +++ b/src/mainboard/asus/mew-vm/Config.lb @@ -14,7 +14,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 ## diff --git a/src/mainboard/asus/mew-vm/Options.lb b/src/mainboard/asus/mew-vm/Options.lb index 72488a2..779f0ed 100644 --- a/src/mainboard/asus/mew-vm/Options.lb +++ b/src/mainboard/asus/mew-vm/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT = 1 ## ## 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 @@ default CONFIG_HAVE_HARD_RESET = 0 ## ## 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 ## diff --git a/src/mainboard/asus/p2b-d/Config.lb b/src/mainboard/asus/p2b-d/Config.lb index 6e4989e..744860b 100644 --- a/src/mainboard/asus/p2b-d/Config.lb +++ b/src/mainboard/asus/p2b-d/Config.lb @@ -25,8 +25,8 @@ default CONFIG_XIP_ROM_BASE = 0xffffffff - CONFIG_XIP_ROM_SIZE + 1 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 $@" diff --git a/src/mainboard/asus/p2b-d/Options.lb b/src/mainboard/asus/p2b-d/Options.lb index 5239f7e..2ccd3a9 100644 --- a/src/mainboard/asus/p2b-d/Options.lb +++ b/src/mainboard/asus/p2b-d/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_IOAPIC 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. diff --git a/src/mainboard/asus/p2b-ds/Config.lb b/src/mainboard/asus/p2b-ds/Config.lb index bd84903..2e48b71 100644 --- a/src/mainboard/asus/p2b-ds/Config.lb +++ b/src/mainboard/asus/p2b-ds/Config.lb @@ -25,8 +25,8 @@ default CONFIG_XIP_ROM_BASE = 0xffffffff - CONFIG_XIP_ROM_SIZE + 1 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 $@" diff --git a/src/mainboard/asus/p2b-ds/Options.lb b/src/mainboard/asus/p2b-ds/Options.lb index b30daf8..45214cf 100644 --- a/src/mainboard/asus/p2b-ds/Options.lb +++ b/src/mainboard/asus/p2b-ds/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_IOAPIC 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. diff --git a/src/mainboard/asus/p2b-f/Config.lb b/src/mainboard/asus/p2b-f/Config.lb index d4a1e86..5813cca 100644 --- a/src/mainboard/asus/p2b-f/Config.lb +++ b/src/mainboard/asus/p2b-f/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/asus/p2b-f/Options.lb b/src/mainboard/asus/p2b-f/Options.lb index 1f8e03b..6884393 100644 --- a/src/mainboard/asus/p2b-f/Options.lb +++ b/src/mainboard/asus/p2b-f/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/asus/p2b/Config.lb b/src/mainboard/asus/p2b/Config.lb index b91b3f8..86bb2a3 100644 --- a/src/mainboard/asus/p2b/Config.lb +++ b/src/mainboard/asus/p2b/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/asus/p2b/Options.lb b/src/mainboard/asus/p2b/Options.lb index 5535514..0d1bb91 100644 --- a/src/mainboard/asus/p2b/Options.lb +++ b/src/mainboard/asus/p2b/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/asus/p3b-f/Config.lb b/src/mainboard/asus/p3b-f/Config.lb index 61d715b..dd95736 100644 --- a/src/mainboard/asus/p3b-f/Config.lb +++ b/src/mainboard/asus/p3b-f/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/asus/p3b-f/Options.lb b/src/mainboard/asus/p3b-f/Options.lb index e7ac071..1320c26 100644 --- a/src/mainboard/asus/p3b-f/Options.lb +++ b/src/mainboard/asus/p3b-f/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/axus/tc320/Config.lb b/src/mainboard/axus/tc320/Config.lb index 54aae53..5425def 100644 --- a/src/mainboard/axus/tc320/Config.lb +++ b/src/mainboard/axus/tc320/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb 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 $@" diff --git a/src/mainboard/axus/tc320/Options.lb b/src/mainboard/axus/tc320/Options.lb index b5d873e..b0fd16e 100644 --- a/src/mainboard/axus/tc320/Options.lb +++ b/src/mainboard/axus/tc320/Options.lb @@ -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_ROM_SIZE = 256 * 1024 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 diff --git a/src/mainboard/azza/pt-6ibd/Config.lb b/src/mainboard/azza/pt-6ibd/Config.lb index 2fa2299..fc19d85 100644 --- a/src/mainboard/azza/pt-6ibd/Config.lb +++ b/src/mainboard/azza/pt-6ibd/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/azza/pt-6ibd/Options.lb b/src/mainboard/azza/pt-6ibd/Options.lb index 1f8e03b..6884393 100644 --- a/src/mainboard/azza/pt-6ibd/Options.lb +++ b/src/mainboard/azza/pt-6ibd/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/bcom/winnet100/Config.lb b/src/mainboard/bcom/winnet100/Config.lb index 7ea700d..81f49c2 100644 --- a/src/mainboard/bcom/winnet100/Config.lb +++ b/src/mainboard/bcom/winnet100/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end makerule ./failover.E diff --git a/src/mainboard/bcom/winnet100/Options.lb b/src/mainboard/bcom/winnet100/Options.lb index 614140e..d241356 100644 --- a/src/mainboard/bcom/winnet100/Options.lb +++ b/src/mainboard/bcom/winnet100/Options.lb @@ -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_ROM_SIZE = 256 * 1024 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 diff --git a/src/mainboard/bcom/winnetp680/Config.lb b/src/mainboard/bcom/winnetp680/Config.lb index 850f8e1..89ab992 100644 --- a/src/mainboard/bcom/winnetp680/Config.lb +++ b/src/mainboard/bcom/winnetp680/Config.lb @@ -25,9 +25,9 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/bcom/winnetp680/Makefile.inc b/src/mainboard/bcom/winnetp680/Makefile.inc index eb24017..61c662d 100644 --- a/src/mainboard/bcom/winnetp680/Makefile.inc +++ b/src/mainboard/bcom/winnetp680/Makefile.inc @@ -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 diff --git a/src/mainboard/bcom/winnetp680/Options.lb b/src/mainboard/bcom/winnetp680/Options.lb index 187fc52..255fd64 100644 --- a/src/mainboard/bcom/winnetp680/Options.lb +++ b/src/mainboard/bcom/winnetp680/Options.lb @@ -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_ROMBASE 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_CONSOLE_SERIAL8250 = 1 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 diff --git a/src/mainboard/biostar/m6tba/Config.lb b/src/mainboard/biostar/m6tba/Config.lb index 1ca8a50..420ecf0 100644 --- a/src/mainboard/biostar/m6tba/Config.lb +++ b/src/mainboard/biostar/m6tba/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/biostar/m6tba/Options.lb b/src/mainboard/biostar/m6tba/Options.lb index 1f8e03b..6884393 100644 --- a/src/mainboard/biostar/m6tba/Options.lb +++ b/src/mainboard/biostar/m6tba/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/broadcom/blast/Config.lb b/src/mainboard/broadcom/blast/Config.lb index e82bc9c..3837562 100644 --- a/src/mainboard/broadcom/blast/Config.lb +++ b/src/mainboard/broadcom/blast/Config.lb @@ -12,8 +12,8 @@ driver mainboard.o #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 diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig index 2cd56f1..fb94ddc 100644 --- a/src/mainboard/broadcom/blast/Kconfig +++ b/src/mainboard/broadcom/blast/Kconfig @@ -9,6 +9,7 @@ config BOARD_BROADCOM_BLAST 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 diff --git a/src/mainboard/broadcom/blast/Makefile.inc b/src/mainboard/broadcom/blast/Makefile.inc index 09a594e..81e9def 100644 --- a/src/mainboard/broadcom/blast/Makefile.inc +++ b/src/mainboard/broadcom/blast/Makefile.inc @@ -2,8 +2,8 @@ driver-y += mainboard.o # 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 diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb index 76b369e..208a6c7 100644 --- a/src/mainboard/broadcom/blast/Options.lb +++ b/src/mainboard/broadcom/blast/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb b/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb index 40ce40b..463598b 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb +++ b/src/mainboard/compaq/deskpro_en_sff_p600/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb index 9e1c251..dd8ab02 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb +++ b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb index 4eb4a02..0f28b50 100644 --- a/src/mainboard/dell/s1850/Config.lb +++ b/src/mainboard/dell/s1850/Config.lb @@ -18,8 +18,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 object reset.o ## diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig index 49c4ae8..4466e44 100644 --- a/src/mainboard/dell/s1850/Kconfig +++ b/src/mainboard/dell/s1850/Kconfig @@ -6,7 +6,8 @@ config BOARD_DELL_S1850 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 diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc index a3473c7..ade0e18 100644 --- a/src/mainboard/dell/s1850/Makefile.inc +++ b/src/mainboard/dell/s1850/Makefile.inc @@ -41,8 +41,8 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds 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 diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb index 61ce744..fb65f8d 100644 --- a/src/mainboard/dell/s1850/Options.lb +++ b/src/mainboard/dell/s1850/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/digitallogic/adl855pc/Config.lb b/src/mainboard/digitallogic/adl855pc/Config.lb index c6401dd..8dd7133 100644 --- a/src/mainboard/digitallogic/adl855pc/Config.lb +++ b/src/mainboard/digitallogic/adl855pc/Config.lb @@ -13,7 +13,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 ## diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb index 2ca09c8..8d649bc 100644 --- a/src/mainboard/digitallogic/adl855pc/Options.lb +++ b/src/mainboard/digitallogic/adl855pc/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_UDELAY_IO=1 ## ## 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 diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb index 0a5ea95..178a7fc 100644 --- a/src/mainboard/digitallogic/msm586seg/Config.lb +++ b/src/mainboard/digitallogic/msm586seg/Config.lb @@ -15,7 +15,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 ## diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb index 27e5fd4..1bd5cae 100644 --- a/src/mainboard/digitallogic/msm586seg/Options.lb +++ b/src/mainboard/digitallogic/msm586seg/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_HAVE_HARD_RESET=0 ## ## 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 diff --git a/src/mainboard/digitallogic/msm800sev/Config.lb b/src/mainboard/digitallogic/msm800sev/Config.lb index f07835d..7b7e2b5 100644 --- a/src/mainboard/digitallogic/msm800sev/Config.lb +++ b/src/mainboard/digitallogic/msm800sev/Config.lb @@ -14,7 +14,7 @@ arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end diff --git a/src/mainboard/digitallogic/msm800sev/Makefile.inc b/src/mainboard/digitallogic/msm800sev/Makefile.inc index eac4755..af94794 100644 --- a/src/mainboard/digitallogic/msm800sev/Makefile.inc +++ b/src/mainboard/digitallogic/msm800sev/Makefile.inc @@ -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. diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb index 10e3bd0..81c2822 100644 --- a/src/mainboard/digitallogic/msm800sev/Options.lb +++ b/src/mainboard/digitallogic/msm800sev/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/eaglelion/5bcm/Config.lb b/src/mainboard/eaglelion/5bcm/Config.lb index d1f02be..3dfe6ab 100644 --- a/src/mainboard/eaglelion/5bcm/Config.lb +++ b/src/mainboard/eaglelion/5bcm/Config.lb @@ -14,7 +14,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 ## diff --git a/src/mainboard/eaglelion/5bcm/Options.lb b/src/mainboard/eaglelion/5bcm/Options.lb index b60a9a7..fb2bfae 100644 --- a/src/mainboard/eaglelion/5bcm/Options.lb +++ b/src/mainboard/eaglelion/5bcm/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/emulation/qemu-x86/Config.lb b/src/mainboard/emulation/qemu-x86/Config.lb index 52d2e3e..d0f2005 100644 --- a/src/mainboard/emulation/qemu-x86/Config.lb +++ b/src/mainboard/emulation/qemu-x86/Config.lb @@ -34,7 +34,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 diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig index fa7258b..8054bc8 100644 --- a/src/mainboard/emulation/qemu-x86/Kconfig +++ b/src/mainboard/emulation/qemu-x86/Kconfig @@ -4,6 +4,7 @@ config BOARD_EMULATION_QEMU_X86 select CPU_I586 select SOUTHBRIDGE_INTEL_I82371EB select CPU_EMULATION_QEMU_X86 + select HAVE_PIRQ_TABLE config MAINBOARD_DIR string diff --git a/src/mainboard/emulation/qemu-x86/Makefile.inc b/src/mainboard/emulation/qemu-x86/Makefile.inc index 1985b2e..977cb4a 100644 --- a/src/mainboard/emulation/qemu-x86/Makefile.inc +++ b/src/mainboard/emulation/qemu-x86/Makefile.inc @@ -6,6 +6,7 @@ crt0-y += ../../../../src/arch/i386/lib/id.inc 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 diff --git a/src/mainboard/emulation/qemu-x86/Options.lb b/src/mainboard/emulation/qemu-x86/Options.lb index e0e35ec..6cf0f76 100644 --- a/src/mainboard/emulation/qemu-x86/Options.lb +++ b/src/mainboard/emulation/qemu-x86/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_HAVE_HARD_RESET=0 ## ## 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 diff --git a/src/mainboard/gigabyte/ga-6bxc/Config.lb b/src/mainboard/gigabyte/ga-6bxc/Config.lb index c6d1ab1..dcd4c79f 100644 --- a/src/mainboard/gigabyte/ga-6bxc/Config.lb +++ b/src/mainboard/gigabyte/ga-6bxc/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/gigabyte/ga-6bxc/Options.lb b/src/mainboard/gigabyte/ga-6bxc/Options.lb index 414611f7..8189979 100644 --- a/src/mainboard/gigabyte/ga-6bxc/Options.lb +++ b/src/mainboard/gigabyte/ga-6bxc/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Config.lb b/src/mainboard/gigabyte/ga_2761gxdk/Config.lb index 104ace0..1cb39c6 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Config.lb +++ b/src/mainboard/gigabyte/ga_2761gxdk/Config.lb @@ -35,8 +35,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig index a0f601b..8726f68 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig +++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig @@ -7,11 +7,10 @@ config BOARD_GIGABYTE_GA_2761GXDK 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 diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc index 8b29eba..1130d07 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc +++ b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o #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 diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb index aa533ee..2c18f9d 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb +++ b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/gigabyte/m57sli/Config.lb b/src/mainboard/gigabyte/m57sli/Config.lb index d328942..6d5a13f 100644 --- a/src/mainboard/gigabyte/m57sli/Config.lb +++ b/src/mainboard/gigabyte/m57sli/Config.lb @@ -33,8 +33,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 #object reset.o if CONFIG_USE_INIT @@ -166,7 +166,7 @@ end ## ## ACPI Support ## -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o makerule dsdt.c depends "$(CONFIG_MAINBOARD)/dsdt.asl" diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig index b67a792..45359cb 100644 --- a/src/mainboard/gigabyte/m57sli/Kconfig +++ b/src/mainboard/gigabyte/m57sli/Kconfig @@ -8,11 +8,11 @@ config BOARD_GIGABYTE_M57SLI 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 diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc index 53f03d0..62b7fd7 100644 --- a/src/mainboard/gigabyte/m57sli/Makefile.inc +++ b/src/mainboard/gigabyte/m57sli/Makefile.inc @@ -23,12 +23,12 @@ driver-y += mainboard.o #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. diff --git a/src/mainboard/gigabyte/m57sli/Options.lb b/src/mainboard/gigabyte/m57sli/Options.lb index 0d42656..73b4689 100644 --- a/src/mainboard/gigabyte/m57sli/Options.lb +++ b/src/mainboard/gigabyte/m57sli/Options.lb @@ -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_SIZEK 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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/hp/dl145_g3/Config.lb b/src/mainboard/hp/dl145_g3/Config.lb index 12ea977..e0eb5d3 100644 --- a/src/mainboard/hp/dl145_g3/Config.lb +++ b/src/mainboard/hp/dl145_g3/Config.lb @@ -40,8 +40,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 diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig index 60cbcfe..512b443 100644 --- a/src/mainboard/hp/dl145_g3/Kconfig +++ b/src/mainboard/hp/dl145_g3/Kconfig @@ -9,6 +9,7 @@ config BOARD_HP_DL145_G3 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 diff --git a/src/mainboard/hp/dl145_g3/Makefile.inc b/src/mainboard/hp/dl145_g3/Makefile.inc index e646f71..5942a75 100644 --- a/src/mainboard/hp/dl145_g3/Makefile.inc +++ b/src/mainboard/hp/dl145_g3/Makefile.inc @@ -2,8 +2,8 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/hp/dl145_g3/Options.lb b/src/mainboard/hp/dl145_g3/Options.lb index 637cd0a..2a598c3 100644 --- a/src/mainboard/hp/dl145_g3/Options.lb +++ b/src/mainboard/hp/dl145_g3/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 ## diff --git a/src/mainboard/ibm/e325/Config.lb b/src/mainboard/ibm/e325/Config.lb index 0c7cd33..dbf896a 100644 --- a/src/mainboard/ibm/e325/Config.lb +++ b/src/mainboard/ibm/e325/Config.lb @@ -13,8 +13,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig index d0e211f..16e1570 100644 --- a/src/mainboard/ibm/e325/Kconfig +++ b/src/mainboard/ibm/e325/Kconfig @@ -9,6 +9,7 @@ config BOARD_IBM_E325 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 diff --git a/src/mainboard/ibm/e325/Makefile.inc b/src/mainboard/ibm/e325/Makefile.inc index 0f9bd72..37671ea 100644 --- a/src/mainboard/ibm/e325/Makefile.inc +++ b/src/mainboard/ibm/e325/Makefile.inc @@ -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. diff --git a/src/mainboard/ibm/e325/Options.lb b/src/mainboard/ibm/e325/Options.lb index 3c1aaff..a745e18 100644 --- a/src/mainboard/ibm/e325/Options.lb +++ b/src/mainboard/ibm/e325/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/ibm/e326/Config.lb b/src/mainboard/ibm/e326/Config.lb index 92a0c52..0020fe3 100644 --- a/src/mainboard/ibm/e326/Config.lb +++ b/src/mainboard/ibm/e326/Config.lb @@ -13,8 +13,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig index 5d3496c..1a9e289 100644 --- a/src/mainboard/ibm/e326/Kconfig +++ b/src/mainboard/ibm/e326/Kconfig @@ -9,6 +9,7 @@ config BOARD_IBM_E326 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 diff --git a/src/mainboard/ibm/e326/Makefile.inc b/src/mainboard/ibm/e326/Makefile.inc index 0f9bd72..37671ea 100644 --- a/src/mainboard/ibm/e326/Makefile.inc +++ b/src/mainboard/ibm/e326/Makefile.inc @@ -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. diff --git a/src/mainboard/ibm/e326/Options.lb b/src/mainboard/ibm/e326/Options.lb index 3ad4f38..265ae75 100644 --- a/src/mainboard/ibm/e326/Options.lb +++ b/src/mainboard/ibm/e326/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/iei/juki-511p/Config.lb b/src/mainboard/iei/juki-511p/Config.lb index 46c039b..a27f2ae 100644 --- a/src/mainboard/iei/juki-511p/Config.lb +++ b/src/mainboard/iei/juki-511p/Config.lb @@ -31,7 +31,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 ## diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig index 3852aa3..6d34a78 100644 --- a/src/mainboard/iei/juki-511p/Kconfig +++ b/src/mainboard/iei/juki-511p/Kconfig @@ -25,7 +25,6 @@ config BOARD_IEI_JUKI_511P 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 diff --git a/src/mainboard/iei/juki-511p/Options.lb b/src/mainboard/iei/juki-511p/Options.lb index 16264f2..d7fde57 100644 --- a/src/mainboard/iei/juki-511p/Options.lb +++ b/src/mainboard/iei/juki-511p/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_UDELAY_IO=1 ## ## 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 diff --git a/src/mainboard/iei/nova4899r/Config.lb b/src/mainboard/iei/nova4899r/Config.lb index 321de6c..fa21551 100644 --- a/src/mainboard/iei/nova4899r/Config.lb +++ b/src/mainboard/iei/nova4899r/Config.lb @@ -15,7 +15,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 ## diff --git a/src/mainboard/iei/nova4899r/Options.lb b/src/mainboard/iei/nova4899r/Options.lb index 8ecef9c..564a441 100644 --- a/src/mainboard/iei/nova4899r/Options.lb +++ b/src/mainboard/iei/nova4899r/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=0 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Config.lb b/src/mainboard/iei/pcisa-lx-800-r10/Config.lb index e4ebbcb..35da03a 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/Config.lb +++ b/src/mainboard/iei/pcisa-lx-800-r10/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb 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. diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc b/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc index eac4755..af94794 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc +++ b/src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc @@ -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. diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb index 4e3581b..b3a6195 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb +++ b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb @@ -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_ROMBASE 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_CONSOLE_VGA = 0 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 diff --git a/src/mainboard/intel/eagleheights/Config.lb b/src/mainboard/intel/eagleheights/Config.lb index a4e1ff3..9dac1fc 100644 --- a/src/mainboard/intel/eagleheights/Config.lb +++ b/src/mainboard/intel/eagleheights/Config.lb @@ -43,10 +43,10 @@ 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 -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object fadt.o object acpi_tables.o makerule dsdt.c diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig index c0ae121..1255db7 100644 --- a/src/mainboard/intel/eagleheights/Kconfig +++ b/src/mainboard/intel/eagleheights/Kconfig @@ -7,6 +7,7 @@ config BOARD_INTEL_EAGLEHEIGHTS 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 diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc index 110ee97..3421755 100644 --- a/src/mainboard/intel/eagleheights/Makefile.inc +++ b/src/mainboard/intel/eagleheights/Makefile.inc @@ -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. diff --git a/src/mainboard/intel/eagleheights/Options.lb b/src/mainboard/intel/eagleheights/Options.lb index 2b0441e..3a2e7b6 100644 --- a/src/mainboard/intel/eagleheights/Options.lb +++ b/src/mainboard/intel/eagleheights/Options.lb @@ -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 @@ default CONFIG_MMCONF_BASE_ADDRESS=0xE0000000 ## ## 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 ## diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb index 4fbd3fb..768c90b 100644 --- a/src/mainboard/intel/jarrell/Config.lb +++ b/src/mainboard/intel/jarrell/Config.lb @@ -18,8 +18,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 object reset.o ## diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig index 4ad4140..7af03d1 100644 --- a/src/mainboard/intel/jarrell/Kconfig +++ b/src/mainboard/intel/jarrell/Kconfig @@ -7,6 +7,7 @@ config BOARD_INTEL_JARRELL select SOUTHBRIDGE_INTEL_I82801ER select SUPERIO_NSC_PC87427 select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select UDELAY_TSC select ATI_RAGE_XL diff --git a/src/mainboard/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb index 56096a3..91927ee 100644 --- a/src/mainboard/intel/jarrell/Options.lb +++ b/src/mainboard/intel/jarrell/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/intel/mtarvon/Config.lb b/src/mainboard/intel/mtarvon/Config.lb index e5e5982..aa8391e 100644 --- a/src/mainboard/intel/mtarvon/Config.lb +++ b/src/mainboard/intel/mtarvon/Config.lb @@ -32,8 +32,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 ## ## Romcc output diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig index 49efb3e..9ee1559 100644 --- a/src/mainboard/intel/mtarvon/Kconfig +++ b/src/mainboard/intel/mtarvon/Kconfig @@ -6,6 +6,7 @@ config BOARD_INTEL_MTARVON select SOUTHBRIDGE_INTEL_I3100 select SUPERIO_INTEL_I3100 select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select UDELAY_TSC config MAINBOARD_DIR diff --git a/src/mainboard/intel/mtarvon/Options.lb b/src/mainboard/intel/mtarvon/Options.lb index b30d963..7d99620 100644 --- a/src/mainboard/intel/mtarvon/Options.lb +++ b/src/mainboard/intel/mtarvon/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/intel/truxton/Config.lb b/src/mainboard/intel/truxton/Config.lb index a297da1..9a29d61 100644 --- a/src/mainboard/intel/truxton/Config.lb +++ b/src/mainboard/intel/truxton/Config.lb @@ -32,8 +32,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 ## ## Romcc output diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig index 4aa96c4..e21cff5 100644 --- a/src/mainboard/intel/truxton/Kconfig +++ b/src/mainboard/intel/truxton/Kconfig @@ -7,6 +7,7 @@ config BOARD_INTEL_TRUXTON select SUPERIO_INTEL_I3100 select SUPERIO_SMSC_SMSCSUPERIO select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select UDELAY_TSC config MAINBOARD_DIR diff --git a/src/mainboard/intel/truxton/Options.lb b/src/mainboard/intel/truxton/Options.lb index ea2f1e8..3815885 100644 --- a/src/mainboard/intel/truxton/Options.lb +++ b/src/mainboard/intel/truxton/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb index 98a1414..b6404a7 100644 --- a/src/mainboard/intel/xe7501devkit/Config.lb +++ b/src/mainboard/intel/xe7501devkit/Config.lb @@ -9,9 +9,9 @@ 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_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 ## diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig index f2b4c1f..36166a3 100644 --- a/src/mainboard/intel/xe7501devkit/Kconfig +++ b/src/mainboard/intel/xe7501devkit/Kconfig @@ -7,6 +7,7 @@ config BOARD_INTEL_XE7501DEVKIT 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 diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc index a40cb5a..cd66339 100644 --- a/src/mainboard/intel/xe7501devkit/Makefile.inc +++ b/src/mainboard/intel/xe7501devkit/Makefile.inc @@ -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 diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb index 19ac7fe..0de6572 100644 --- a/src/mainboard/intel/xe7501devkit/Options.lb +++ b/src/mainboard/intel/xe7501devkit/Options.lb @@ -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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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? diff --git a/src/mainboard/iwill/dk8_htx/Config.lb b/src/mainboard/iwill/dk8_htx/Config.lb index 54a66c7..b6ea0e2 100644 --- a/src/mainboard/iwill/dk8_htx/Config.lb +++ b/src/mainboard/iwill/dk8_htx/Config.lb @@ -15,15 +15,15 @@ driver mainboard.o #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 #end -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o object fadt.o makerule dsdt.c diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig index ace1650..bfdd91b 100644 --- a/src/mainboard/iwill/dk8_htx/Kconfig +++ b/src/mainboard/iwill/dk8_htx/Kconfig @@ -9,6 +9,7 @@ config BOARD_IWILL_DK8_HTX 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 diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc index 6135e90..c2a3ade 100644 --- a/src/mainboard/iwill/dk8_htx/Makefile.inc +++ b/src/mainboard/iwill/dk8_htx/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # 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 diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb index 55fd1f0..1e5484a 100644 --- a/src/mainboard/iwill/dk8_htx/Options.lb +++ b/src/mainboard/iwill/dk8_htx/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/iwill/dk8s2/Config.lb b/src/mainboard/iwill/dk8s2/Config.lb index 8f34a30..19fc42a 100644 --- a/src/mainboard/iwill/dk8s2/Config.lb +++ b/src/mainboard/iwill/dk8s2/Config.lb @@ -13,8 +13,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 #object reset.o ## ATI Rage XL framebuffering graphics driver diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig index 32d2a27..4899127 100644 --- a/src/mainboard/iwill/dk8s2/Kconfig +++ b/src/mainboard/iwill/dk8s2/Kconfig @@ -9,6 +9,7 @@ config BOARD_IWILL_DK8S2 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 diff --git a/src/mainboard/iwill/dk8s2/Makefile.inc b/src/mainboard/iwill/dk8s2/Makefile.inc index 0f9bd72..37671ea 100644 --- a/src/mainboard/iwill/dk8s2/Makefile.inc +++ b/src/mainboard/iwill/dk8s2/Makefile.inc @@ -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. diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb index 208aeee..911a54b 100644 --- a/src/mainboard/iwill/dk8s2/Options.lb +++ b/src/mainboard/iwill/dk8s2/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/iwill/dk8x/Config.lb b/src/mainboard/iwill/dk8x/Config.lb index 7e2dd6d..1bd1cf1 100644 --- a/src/mainboard/iwill/dk8x/Config.lb +++ b/src/mainboard/iwill/dk8x/Config.lb @@ -13,8 +13,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig index a18152d..ef07b16 100644 --- a/src/mainboard/iwill/dk8x/Kconfig +++ b/src/mainboard/iwill/dk8x/Kconfig @@ -9,6 +9,7 @@ config BOARD_IWILL_DK8X 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 diff --git a/src/mainboard/iwill/dk8x/Makefile.inc b/src/mainboard/iwill/dk8x/Makefile.inc index 86d71e1..c382cc6 100644 --- a/src/mainboard/iwill/dk8x/Makefile.inc +++ b/src/mainboard/iwill/dk8x/Makefile.inc @@ -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. diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb index a9e396d..5cc8161 100644 --- a/src/mainboard/iwill/dk8x/Options.lb +++ b/src/mainboard/iwill/dk8x/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/jetway/j7f24/Config.lb b/src/mainboard/jetway/j7f24/Config.lb index bd33c3f..1758d5d 100644 --- a/src/mainboard/jetway/j7f24/Config.lb +++ b/src/mainboard/jetway/j7f24/Config.lb @@ -25,9 +25,9 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/jetway/j7f24/Makefile.inc b/src/mainboard/jetway/j7f24/Makefile.inc index 2a637c8..c21d657 100644 --- a/src/mainboard/jetway/j7f24/Makefile.inc +++ b/src/mainboard/jetway/j7f24/Makefile.inc @@ -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 diff --git a/src/mainboard/jetway/j7f24/Options.lb b/src/mainboard/jetway/j7f24/Options.lb index 2f17f01..b53a62f 100644 --- a/src/mainboard/jetway/j7f24/Options.lb +++ b/src/mainboard/jetway/j7f24/Options.lb @@ -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_ROMBASE 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_CONSOLE_SERIAL8250 = 1 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 diff --git a/src/mainboard/kontron/986lcd-m/Config.lb b/src/mainboard/kontron/986lcd-m/Config.lb index 6b73f04..4f96076 100644 --- a/src/mainboard/kontron/986lcd-m/Config.lb +++ b/src/mainboard/kontron/986lcd-m/Config.lb @@ -46,11 +46,11 @@ arch i386 end 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 diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index 14442fb..28d54dd 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -7,6 +7,7 @@ config BOARD_KONTRON_986LCD_M 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 diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc index bd3495a..b719b58 100644 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -27,11 +27,11 @@ driver-y += mainboard.o 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 diff --git a/src/mainboard/kontron/986lcd-m/Options.lb b/src/mainboard/kontron/986lcd-m/Options.lb index 2f42d5d..feb26a6 100644 --- a/src/mainboard/kontron/986lcd-m/Options.lb +++ b/src/mainboard/kontron/986lcd-m/Options.lb @@ -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 @@ default CONFIG_GFXUMA=1 ## ## 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 diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c index 0f5e704..27942e3 100644 --- a/src/mainboard/kontron/986lcd-m/acpi_tables.c +++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c @@ -355,7 +355,7 @@ unsigned long write_acpi_tables(unsigned long start) 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; diff --git a/src/mainboard/kontron/kt690/Config.lb b/src/mainboard/kontron/kt690/Config.lb index 0f75772..1fb667d 100644 --- a/src/mainboard/kontron/kt690/Config.lb +++ b/src/mainboard/kontron/kt690/Config.lb @@ -33,13 +33,13 @@ driver mainboard.o #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 diff --git a/src/mainboard/kontron/kt690/Makefile.inc b/src/mainboard/kontron/kt690/Makefile.inc index 0a2460d..317f9ca 100644 --- a/src/mainboard/kontron/kt690/Makefile.inc +++ b/src/mainboard/kontron/kt690/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/kontron/kt690/Options.lb b/src/mainboard/kontron/kt690/Options.lb index 1ca2dfb..6e3ad13 100644 --- a/src/mainboard/kontron/kt690/Options.lb +++ b/src/mainboard/kontron/kt690/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/kontron/kt690/mptable.c b/src/mainboard/kontron/kt690/mptable.c index f629e55..06926bd 100644 --- a/src/mainboard/kontron/kt690/mptable.c +++ b/src/mainboard/kontron/kt690/mptable.c @@ -142,7 +142,7 @@ void *smp_write_config_table(void *v) /* 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 diff --git a/src/mainboard/lippert/frontrunner/Config.lb b/src/mainboard/lippert/frontrunner/Config.lb index daf5133..f5513a3 100644 --- a/src/mainboard/lippert/frontrunner/Config.lb +++ b/src/mainboard/lippert/frontrunner/Config.lb @@ -14,7 +14,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 ## diff --git a/src/mainboard/lippert/frontrunner/Options.lb b/src/mainboard/lippert/frontrunner/Options.lb index a6549dc..e6a9b48 100644 --- a/src/mainboard/lippert/frontrunner/Options.lb +++ b/src/mainboard/lippert/frontrunner/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/lippert/roadrunner-lx/Config.lb b/src/mainboard/lippert/roadrunner-lx/Config.lb index 00b6713..8e52fa5 100644 --- a/src/mainboard/lippert/roadrunner-lx/Config.lb +++ b/src/mainboard/lippert/roadrunner-lx/Config.lb @@ -36,7 +36,7 @@ arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end diff --git a/src/mainboard/lippert/roadrunner-lx/Makefile.inc b/src/mainboard/lippert/roadrunner-lx/Makefile.inc index eac4755..af94794 100644 --- a/src/mainboard/lippert/roadrunner-lx/Makefile.inc +++ b/src/mainboard/lippert/roadrunner-lx/Makefile.inc @@ -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. diff --git a/src/mainboard/lippert/roadrunner-lx/Options.lb b/src/mainboard/lippert/roadrunner-lx/Options.lb index 486f239..b9ca9db 100644 --- a/src/mainboard/lippert/roadrunner-lx/Options.lb +++ b/src/mainboard/lippert/roadrunner-lx/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT = 1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1 ## ## 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 diff --git a/src/mainboard/lippert/spacerunner-lx/Config.lb b/src/mainboard/lippert/spacerunner-lx/Config.lb index b74ce8b..7b4d9b4 100644 --- a/src/mainboard/lippert/spacerunner-lx/Config.lb +++ b/src/mainboard/lippert/spacerunner-lx/Config.lb @@ -35,7 +35,7 @@ arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end diff --git a/src/mainboard/lippert/spacerunner-lx/Makefile.inc b/src/mainboard/lippert/spacerunner-lx/Makefile.inc index eac4755..af94794 100644 --- a/src/mainboard/lippert/spacerunner-lx/Makefile.inc +++ b/src/mainboard/lippert/spacerunner-lx/Makefile.inc @@ -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. diff --git a/src/mainboard/lippert/spacerunner-lx/Options.lb b/src/mainboard/lippert/spacerunner-lx/Options.lb index f004873..5bb104b 100644 --- a/src/mainboard/lippert/spacerunner-lx/Options.lb +++ b/src/mainboard/lippert/spacerunner-lx/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT = 1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1 ## ## 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 diff --git a/src/mainboard/mitac/6513wu/Config.lb b/src/mainboard/mitac/6513wu/Config.lb index 5c9a63f..0d22324 100644 --- a/src/mainboard/mitac/6513wu/Config.lb +++ b/src/mainboard/mitac/6513wu/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end makerule ./failover.E diff --git a/src/mainboard/mitac/6513wu/Options.lb b/src/mainboard/mitac/6513wu/Options.lb index ed08ab4..0dac44b 100644 --- a/src/mainboard/mitac/6513wu/Options.lb +++ b/src/mainboard/mitac/6513wu/Options.lb @@ -27,9 +27,9 @@ uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL 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 @@ uses HOSTCC 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 diff --git a/src/mainboard/msi/ms6119/Config.lb b/src/mainboard/msi/ms6119/Config.lb index 3836ca8..2a5fb79 100644 --- a/src/mainboard/msi/ms6119/Config.lb +++ b/src/mainboard/msi/ms6119/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/msi/ms6119/Options.lb b/src/mainboard/msi/ms6119/Options.lb index 98b3a8c..7930819 100644 --- a/src/mainboard/msi/ms6119/Options.lb +++ b/src/mainboard/msi/ms6119/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/msi/ms6147/Config.lb b/src/mainboard/msi/ms6147/Config.lb index 31b5bf2..c63f59a 100644 --- a/src/mainboard/msi/ms6147/Config.lb +++ b/src/mainboard/msi/ms6147/Config.lb @@ -26,7 +26,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 diff --git a/src/mainboard/msi/ms6147/Options.lb b/src/mainboard/msi/ms6147/Options.lb index 318017d..e6ccb87 100644 --- a/src/mainboard/msi/ms6147/Options.lb +++ b/src/mainboard/msi/ms6147/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/msi/ms6156/Config.lb b/src/mainboard/msi/ms6156/Config.lb index 3f0862f..cbb02e4 100644 --- a/src/mainboard/msi/ms6156/Config.lb +++ b/src/mainboard/msi/ms6156/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/msi/ms6156/Options.lb b/src/mainboard/msi/ms6156/Options.lb index fa5d142..8d6de68 100644 --- a/src/mainboard/msi/ms6156/Options.lb +++ b/src/mainboard/msi/ms6156/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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" diff --git a/src/mainboard/msi/ms6178/Config.lb b/src/mainboard/msi/ms6178/Config.lb index 8ca226d..755144d 100644 --- a/src/mainboard/msi/ms6178/Config.lb +++ b/src/mainboard/msi/ms6178/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb 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" diff --git a/src/mainboard/msi/ms6178/Options.lb b/src/mainboard/msi/ms6178/Options.lb index 1125949..04660f0 100644 --- a/src/mainboard/msi/ms6178/Options.lb +++ b/src/mainboard/msi/ms6178/Options.lb @@ -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_ROMBASE 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_UDELAY_TSC 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_UDELAY_TSC = 1 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 diff --git a/src/mainboard/msi/ms7135/Config.lb b/src/mainboard/msi/ms7135/Config.lb index 5bd867b..ce8565c 100644 --- a/src/mainboard/msi/ms7135/Config.lb +++ b/src/mainboard/msi/ms7135/Config.lb @@ -39,11 +39,11 @@ driver mainboard.o # 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 diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig index fef2cf0..da72601 100644 --- a/src/mainboard/msi/ms7135/Kconfig +++ b/src/mainboard/msi/ms7135/Kconfig @@ -7,7 +7,8 @@ config BOARD_MSI_MS7135 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 diff --git a/src/mainboard/msi/ms7135/Options.lb b/src/mainboard/msi/ms7135/Options.lb index 4a3809d..2d09cd0 100644 --- a/src/mainboard/msi/ms7135/Options.lb +++ b/src/mainboard/msi/ms7135/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/msi/ms7260/Config.lb b/src/mainboard/msi/ms7260/Config.lb index d17e097..24e8039 100644 --- a/src/mainboard/msi/ms7260/Config.lb +++ b/src/mainboard/msi/ms7260/Config.lb @@ -26,8 +26,8 @@ arch i386 end 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 diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig index 9ccce1f..6890108 100644 --- a/src/mainboard/msi/ms7260/Kconfig +++ b/src/mainboard/msi/ms7260/Kconfig @@ -7,11 +7,11 @@ config BOARD_MSI_MS7260 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 diff --git a/src/mainboard/msi/ms7260/Makefile.inc b/src/mainboard/msi/ms7260/Makefile.inc index dcc6331..f10f36c 100644 --- a/src/mainboard/msi/ms7260/Makefile.inc +++ b/src/mainboard/msi/ms7260/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o #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 diff --git a/src/mainboard/msi/ms7260/Options.lb b/src/mainboard/msi/ms7260/Options.lb index 5affc40..8e52def 100644 --- a/src/mainboard/msi/ms7260/Options.lb +++ b/src/mainboard/msi/ms7260/Options.lb @@ -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_LB_MEM_TOPK = 2048 # 1MB more for pgtbl. 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 diff --git a/src/mainboard/msi/ms9185/Config.lb b/src/mainboard/msi/ms9185/Config.lb index 99b8600..c02f260 100644 --- a/src/mainboard/msi/ms9185/Config.lb +++ b/src/mainboard/msi/ms9185/Config.lb @@ -39,11 +39,11 @@ driver mainboard.o #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 diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index c2dcd9d..6dc605d 100644 --- a/src/mainboard/msi/ms9185/Kconfig +++ b/src/mainboard/msi/ms9185/Kconfig @@ -9,9 +9,11 @@ config BOARD_MSI_MS9185 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 diff --git a/src/mainboard/msi/ms9185/Makefile.inc b/src/mainboard/msi/ms9185/Makefile.inc index e646f71..5942a75 100644 --- a/src/mainboard/msi/ms9185/Makefile.inc +++ b/src/mainboard/msi/ms9185/Makefile.inc @@ -2,8 +2,8 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/msi/ms9185/Options.lb b/src/mainboard/msi/ms9185/Options.lb index 1f36498..41bbc99 100644 --- a/src/mainboard/msi/ms9185/Options.lb +++ b/src/mainboard/msi/ms9185/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/msi/ms9282/Config.lb b/src/mainboard/msi/ms9282/Config.lb index 056f7ad..af320ea 100644 --- a/src/mainboard/msi/ms9282/Config.lb +++ b/src/mainboard/msi/ms9282/Config.lb @@ -41,8 +41,8 @@ driver mainboard.o 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 diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig index 8b6e0c1..ce57499 100644 --- a/src/mainboard/msi/ms9282/Kconfig +++ b/src/mainboard/msi/ms9282/Kconfig @@ -7,11 +7,11 @@ config BOARD_MSI_MS9282 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 diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc index 7be20a2..510ee6f 100644 --- a/src/mainboard/msi/ms9282/Makefile.inc +++ b/src/mainboard/msi/ms9282/Makefile.inc @@ -25,8 +25,8 @@ driver-y += ../../../drivers/i2c/adm1027/adm1027.o #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 diff --git a/src/mainboard/msi/ms9282/Options.lb b/src/mainboard/msi/ms9282/Options.lb index 6ed187a..146cc21 100644 --- a/src/mainboard/msi/ms9282/Options.lb +++ b/src/mainboard/msi/ms9282/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/nec/powermate2000/Config.lb b/src/mainboard/nec/powermate2000/Config.lb index 118d615..c7a8615 100644 --- a/src/mainboard/nec/powermate2000/Config.lb +++ b/src/mainboard/nec/powermate2000/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb 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" diff --git a/src/mainboard/nec/powermate2000/Options.lb b/src/mainboard/nec/powermate2000/Options.lb index 38d87f1..735f30c 100644 --- a/src/mainboard/nec/powermate2000/Options.lb +++ b/src/mainboard/nec/powermate2000/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/newisys/khepri/Config.lb b/src/mainboard/newisys/khepri/Config.lb index f24c351..72ded47 100644 --- a/src/mainboard/newisys/khepri/Config.lb +++ b/src/mainboard/newisys/khepri/Config.lb @@ -13,8 +13,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig index 84285ff..350d583 100644 --- a/src/mainboard/newisys/khepri/Kconfig +++ b/src/mainboard/newisys/khepri/Kconfig @@ -9,6 +9,7 @@ config BOARD_NEWISYS_KHEPRI 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 diff --git a/src/mainboard/newisys/khepri/Makefile.inc b/src/mainboard/newisys/khepri/Makefile.inc index 86d71e1..c382cc6 100644 --- a/src/mainboard/newisys/khepri/Makefile.inc +++ b/src/mainboard/newisys/khepri/Makefile.inc @@ -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. diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb index 266f7ba..ad54dc6 100644 --- a/src/mainboard/newisys/khepri/Options.lb +++ b/src/mainboard/newisys/khepri/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/nvidia/l1_2pvv/Config.lb b/src/mainboard/nvidia/l1_2pvv/Config.lb index 978e88f..eab69e6 100644 --- a/src/mainboard/nvidia/l1_2pvv/Config.lb +++ b/src/mainboard/nvidia/l1_2pvv/Config.lb @@ -33,11 +33,11 @@ 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 #object reset.o -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o object fadt.o makerule dsdt.c diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig index a153993..4e9dc60 100644 --- a/src/mainboard/nvidia/l1_2pvv/Kconfig +++ b/src/mainboard/nvidia/l1_2pvv/Kconfig @@ -7,11 +7,11 @@ config BOARD_NVIDIA_L1_2PVV 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 diff --git a/src/mainboard/nvidia/l1_2pvv/Makefile.inc b/src/mainboard/nvidia/l1_2pvv/Makefile.inc index 56cbf31..66cc3e6 100644 --- a/src/mainboard/nvidia/l1_2pvv/Makefile.inc +++ b/src/mainboard/nvidia/l1_2pvv/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o #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 diff --git a/src/mainboard/nvidia/l1_2pvv/Options.lb b/src/mainboard/nvidia/l1_2pvv/Options.lb index 3b86621..a3d8f8e 100644 --- a/src/mainboard/nvidia/l1_2pvv/Options.lb +++ b/src/mainboard/nvidia/l1_2pvv/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/olpc/btest/Config.lb b/src/mainboard/olpc/btest/Config.lb index c35fb90..cc9c073 100644 --- a/src/mainboard/olpc/btest/Config.lb +++ b/src/mainboard/olpc/btest/Config.lb @@ -14,7 +14,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 ## diff --git a/src/mainboard/olpc/btest/Options.lb b/src/mainboard/olpc/btest/Options.lb index c80ce54..ab05e04 100644 --- a/src/mainboard/olpc/btest/Options.lb +++ b/src/mainboard/olpc/btest/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/olpc/rev_a/Config.lb b/src/mainboard/olpc/rev_a/Config.lb index c35fb90..cc9c073 100644 --- a/src/mainboard/olpc/rev_a/Config.lb +++ b/src/mainboard/olpc/rev_a/Config.lb @@ -14,7 +14,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 ## diff --git a/src/mainboard/olpc/rev_a/Options.lb b/src/mainboard/olpc/rev_a/Options.lb index c80ce54..ab05e04 100644 --- a/src/mainboard/olpc/rev_a/Options.lb +++ b/src/mainboard/olpc/rev_a/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/pcengines/alix1c/Config.lb b/src/mainboard/pcengines/alix1c/Config.lb index 0580d74..579397d 100644 --- a/src/mainboard/pcengines/alix1c/Config.lb +++ b/src/mainboard/pcengines/alix1c/Config.lb @@ -34,7 +34,7 @@ arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end diff --git a/src/mainboard/pcengines/alix1c/Makefile.inc b/src/mainboard/pcengines/alix1c/Makefile.inc index 90b154a..4a26b97 100644 --- a/src/mainboard/pcengines/alix1c/Makefile.inc +++ b/src/mainboard/pcengines/alix1c/Makefile.inc @@ -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. diff --git a/src/mainboard/pcengines/alix1c/Options.lb b/src/mainboard/pcengines/alix1c/Options.lb index dab333d..37fa14a 100644 --- a/src/mainboard/pcengines/alix1c/Options.lb +++ b/src/mainboard/pcengines/alix1c/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 ## diff --git a/src/mainboard/rca/rm4100/Config.lb b/src/mainboard/rca/rm4100/Config.lb index ce254cd..125117e 100644 --- a/src/mainboard/rca/rm4100/Config.lb +++ b/src/mainboard/rca/rm4100/Config.lb @@ -24,9 +24,9 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/rca/rm4100/Options.lb b/src/mainboard/rca/rm4100/Options.lb index bd9fc03..c9b28ce 100644 --- a/src/mainboard/rca/rm4100/Options.lb +++ b/src/mainboard/rca/rm4100/Options.lb @@ -32,12 +32,12 @@ uses CONFIG_VIDEO_MB 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_HAVE_FALLBACK_BOOT = 1 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 diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb b/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb index 87a9c7d..5f00846 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb +++ b/src/mainboard/soyo/sy-6ba-plus-iii/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb b/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb index 3f66863..61b24fc 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb +++ b/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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. diff --git a/src/mainboard/sunw/ultra40/Config.lb b/src/mainboard/sunw/ultra40/Config.lb index 450b293..908b977 100644 --- a/src/mainboard/sunw/ultra40/Config.lb +++ b/src/mainboard/sunw/ultra40/Config.lb @@ -14,8 +14,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 #object reset.o if CONFIG_USE_INIT makerule ./auto.o diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index bc4513b..5e09db7 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -8,6 +8,7 @@ config BOARD_SUNW_ULTRA40 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 diff --git a/src/mainboard/sunw/ultra40/Makefile.inc b/src/mainboard/sunw/ultra40/Makefile.inc index bfba668..6bbef3c 100644 --- a/src/mainboard/sunw/ultra40/Makefile.inc +++ b/src/mainboard/sunw/ultra40/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb index 8c0fef5..c9d550e 100644 --- a/src/mainboard/sunw/ultra40/Options.lb +++ b/src/mainboard/sunw/ultra40/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/h8dme/Config.lb b/src/mainboard/supermicro/h8dme/Config.lb index 9c07ae9..3309805 100644 --- a/src/mainboard/supermicro/h8dme/Config.lb +++ b/src/mainboard/supermicro/h8dme/Config.lb @@ -30,8 +30,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig index e07614b..ccf07eb 100644 --- a/src/mainboard/supermicro/h8dme/Kconfig +++ b/src/mainboard/supermicro/h8dme/Kconfig @@ -8,6 +8,7 @@ config BOARD_SUPERMICRO_H8DME 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 diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc index d8864fe..8075ba2 100644 --- a/src/mainboard/supermicro/h8dme/Makefile.inc +++ b/src/mainboard/supermicro/h8dme/Makefile.inc @@ -24,8 +24,8 @@ driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o # 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. diff --git a/src/mainboard/supermicro/h8dme/Options.lb b/src/mainboard/supermicro/h8dme/Options.lb index 8737537..9f7095c 100644 --- a/src/mainboard/supermicro/h8dme/Options.lb +++ b/src/mainboard/supermicro/h8dme/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/h8dmr/Config.lb b/src/mainboard/supermicro/h8dmr/Config.lb index 2aca572..05f4514 100644 --- a/src/mainboard/supermicro/h8dmr/Config.lb +++ b/src/mainboard/supermicro/h8dmr/Config.lb @@ -33,8 +33,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig index 4cb20f4..3a359af 100644 --- a/src/mainboard/supermicro/h8dmr/Kconfig +++ b/src/mainboard/supermicro/h8dmr/Kconfig @@ -8,6 +8,7 @@ config BOARD_SUPERMICRO_H8DMR 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 diff --git a/src/mainboard/supermicro/h8dmr/Makefile.inc b/src/mainboard/supermicro/h8dmr/Makefile.inc index 085b7d0..8b64208 100644 --- a/src/mainboard/supermicro/h8dmr/Makefile.inc +++ b/src/mainboard/supermicro/h8dmr/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/supermicro/h8dmr/Options.lb b/src/mainboard/supermicro/h8dmr/Options.lb index 739fe16..f95c63c 100644 --- a/src/mainboard/supermicro/h8dmr/Options.lb +++ b/src/mainboard/supermicro/h8dmr/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/h8dmr_fam10/Config.lb b/src/mainboard/supermicro/h8dmr_fam10/Config.lb index c6a8c53..d3d8fa8 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Config.lb +++ b/src/mainboard/supermicro/h8dmr_fam10/Config.lb @@ -35,8 +35,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig index 3d6b375..67ec682 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig +++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig @@ -8,6 +8,7 @@ config BOARD_SUPERMICRO_H8DMR_FAM10 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 diff --git a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc index 085b7d0..8b64208 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc +++ b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/supermicro/h8dmr_fam10/Options.lb b/src/mainboard/supermicro/h8dmr_fam10/Options.lb index f7b602a..2ad708a 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Options.lb +++ b/src/mainboard/supermicro/h8dmr_fam10/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/x6dai_g/Config.lb b/src/mainboard/supermicro/x6dai_g/Config.lb index 3e9a87e..2756977 100644 --- a/src/mainboard/supermicro/x6dai_g/Config.lb +++ b/src/mainboard/supermicro/x6dai_g/Config.lb @@ -18,8 +18,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 object reset.o ## diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig index 4c96574..c6f7334 100644 --- a/src/mainboard/supermicro/x6dai_g/Kconfig +++ b/src/mainboard/supermicro/x6dai_g/Kconfig @@ -5,7 +5,8 @@ config BOARD_SUPERMICRO_X6DAI_G 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 diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb index e3c9912..626f0be 100644 --- a/src/mainboard/supermicro/x6dai_g/Options.lb +++ b/src/mainboard/supermicro/x6dai_g/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/x6dhe_g/Config.lb b/src/mainboard/supermicro/x6dhe_g/Config.lb index 2c34ff3..deaee04 100644 --- a/src/mainboard/supermicro/x6dhe_g/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g/Config.lb @@ -17,8 +17,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 object reset.o ## diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig index ecbe7d7..467859a 100644 --- a/src/mainboard/supermicro/x6dhe_g/Kconfig +++ b/src/mainboard/supermicro/x6dhe_g/Kconfig @@ -6,7 +6,8 @@ config BOARD_SUPERMICRO_X6DHE_G 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 diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb index fcc68a2..87be848 100644 --- a/src/mainboard/supermicro/x6dhe_g/Options.lb +++ b/src/mainboard/supermicro/x6dhe_g/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb index 722a020..3d7ed96 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g2/Config.lb @@ -17,8 +17,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 object reset.o ## diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig index d0eb1ed..c651cc0 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Kconfig +++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig @@ -6,7 +6,8 @@ config BOARD_SUPERMICRO_X6DHE_G2 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 diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb index fcc68a2..87be848 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Options.lb +++ b/src/mainboard/supermicro/x6dhe_g2/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/x6dhr_ig/Config.lb b/src/mainboard/supermicro/x6dhr_ig/Config.lb index e2d37dc..1dfafd5 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig/Config.lb @@ -18,8 +18,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 object reset.o ## diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig index 32a8183..c5d6cf3 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Kconfig +++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig @@ -6,7 +6,8 @@ config BOARD_SUPERMICRO_X6DHR_IG 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 diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb index 2698b3b..d8b836b 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Options.lb +++ b/src/mainboard/supermicro/x6dhr_ig/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/supermicro/x6dhr_ig2/Config.lb b/src/mainboard/supermicro/x6dhr_ig2/Config.lb index 566b776..09147e4 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig2/Config.lb @@ -18,8 +18,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 object reset.o ## diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig index eee5640..8d88331 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig +++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig @@ -6,7 +6,8 @@ config BOARD_SUPERMICRO_X6DHR_IG2 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 diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb index 2698b3b..d8b836b 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb +++ b/src/mainboard/supermicro/x6dhr_ig2/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/technexion/tim5690/Config.lb b/src/mainboard/technexion/tim5690/Config.lb index 96fe267..3e69acc 100644 --- a/src/mainboard/technexion/tim5690/Config.lb +++ b/src/mainboard/technexion/tim5690/Config.lb @@ -33,13 +33,13 @@ driver mainboard.o #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 diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig index 2e4ea5f..20194a1 100644 --- a/src/mainboard/technexion/tim5690/Kconfig +++ b/src/mainboard/technexion/tim5690/Kconfig @@ -9,6 +9,7 @@ config BOARD_TECHNEXION_TIM5690 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 diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc index 0a2460d..317f9ca 100644 --- a/src/mainboard/technexion/tim5690/Makefile.inc +++ b/src/mainboard/technexion/tim5690/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/technexion/tim5690/Options.lb b/src/mainboard/technexion/tim5690/Options.lb index 83174c3..ad1e80a 100644 --- a/src/mainboard/technexion/tim5690/Options.lb +++ b/src/mainboard/technexion/tim5690/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/technexion/tim5690/mptable.c b/src/mainboard/technexion/tim5690/mptable.c index 7d7b344..ee4a2ff 100644 --- a/src/mainboard/technexion/tim5690/mptable.c +++ b/src/mainboard/technexion/tim5690/mptable.c @@ -142,7 +142,7 @@ void *smp_write_config_table(void *v) /* 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 diff --git a/src/mainboard/technexion/tim8690/Config.lb b/src/mainboard/technexion/tim8690/Config.lb index 9ee9be4..904958f 100644 --- a/src/mainboard/technexion/tim8690/Config.lb +++ b/src/mainboard/technexion/tim8690/Config.lb @@ -33,13 +33,13 @@ driver mainboard.o #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 diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig index 8bc3b65..d0a9e41 100644 --- a/src/mainboard/technexion/tim8690/Kconfig +++ b/src/mainboard/technexion/tim8690/Kconfig @@ -9,6 +9,7 @@ config BOARD_TECHNEXION_TIM8690 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 diff --git a/src/mainboard/technexion/tim8690/Makefile.inc b/src/mainboard/technexion/tim8690/Makefile.inc index 0a2460d..317f9ca 100644 --- a/src/mainboard/technexion/tim8690/Makefile.inc +++ b/src/mainboard/technexion/tim8690/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # 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. diff --git a/src/mainboard/technexion/tim8690/Options.lb b/src/mainboard/technexion/tim8690/Options.lb index d784ac1..9589fcd 100644 --- a/src/mainboard/technexion/tim8690/Options.lb +++ b/src/mainboard/technexion/tim8690/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/technexion/tim8690/mptable.c b/src/mainboard/technexion/tim8690/mptable.c index fb990fd..6359c09 100644 --- a/src/mainboard/technexion/tim8690/mptable.c +++ b/src/mainboard/technexion/tim8690/mptable.c @@ -142,7 +142,7 @@ void *smp_write_config_table(void *v) /* 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 diff --git a/src/mainboard/technologic/ts5300/Config.lb b/src/mainboard/technologic/ts5300/Config.lb index 525f82e..13b0a78 100644 --- a/src/mainboard/technologic/ts5300/Config.lb +++ b/src/mainboard/technologic/ts5300/Config.lb @@ -16,7 +16,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 ## diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb index f01cde6..1028c98 100644 --- a/src/mainboard/technologic/ts5300/Options.lb +++ b/src/mainboard/technologic/ts5300/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_HAVE_HARD_RESET=0 ## ## 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 diff --git a/src/mainboard/televideo/tc7020/Config.lb b/src/mainboard/televideo/tc7020/Config.lb index 66b1914..114f435 100644 --- a/src/mainboard/televideo/tc7020/Config.lb +++ b/src/mainboard/televideo/tc7020/Config.lb @@ -24,7 +24,7 @@ include /config/nofailovercalculation.lb arch i386 end driver mainboard.o -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end makerule ./failover.E diff --git a/src/mainboard/televideo/tc7020/Options.lb b/src/mainboard/televideo/tc7020/Options.lb index 683b19b..9b0cfb8 100644 --- a/src/mainboard/televideo/tc7020/Options.lb +++ b/src/mainboard/televideo/tc7020/Options.lb @@ -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_ROM_SIZE = 256 * 1024 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 diff --git a/src/mainboard/thomson/ip1000/Config.lb b/src/mainboard/thomson/ip1000/Config.lb index 59e4f77..2ee6f96 100644 --- a/src/mainboard/thomson/ip1000/Config.lb +++ b/src/mainboard/thomson/ip1000/Config.lb @@ -24,9 +24,9 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/thomson/ip1000/Options.lb b/src/mainboard/thomson/ip1000/Options.lb index 955d4e2..655d94f 100644 --- a/src/mainboard/thomson/ip1000/Options.lb +++ b/src/mainboard/thomson/ip1000/Options.lb @@ -32,12 +32,12 @@ uses CONFIG_VIDEO_MB 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_HAVE_FALLBACK_BOOT = 1 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 diff --git a/src/mainboard/tyan/Makefile.s289x.inc b/src/mainboard/tyan/Makefile.s289x.inc index fc78b66..4c0ea98 100644 --- a/src/mainboard/tyan/Makefile.s289x.inc +++ b/src/mainboard/tyan/Makefile.s289x.inc @@ -27,10 +27,10 @@ driver-y += mainboard.o #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 diff --git a/src/mainboard/tyan/s1846/Config.lb b/src/mainboard/tyan/s1846/Config.lb index 2a5c8b2..d98368b 100644 --- a/src/mainboard/tyan/s1846/Config.lb +++ b/src/mainboard/tyan/s1846/Config.lb @@ -25,7 +25,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 diff --git a/src/mainboard/tyan/s1846/Options.lb b/src/mainboard/tyan/s1846/Options.lb index 6a56131..bf30506 100644 --- a/src/mainboard/tyan/s1846/Options.lb +++ b/src/mainboard/tyan/s1846/Options.lb @@ -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_ROMBASE 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 @@ uses CONFIG_PCI_ROM_RUN 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 diff --git a/src/mainboard/tyan/s2735/Config.lb b/src/mainboard/tyan/s2735/Config.lb index 9cc0bc3..c15d091 100644 --- a/src/mainboard/tyan/s2735/Config.lb +++ b/src/mainboard/tyan/s2735/Config.lb @@ -10,8 +10,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 object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig index e39c5ea..3310776 100644 --- a/src/mainboard/tyan/s2735/Kconfig +++ b/src/mainboard/tyan/s2735/Kconfig @@ -7,6 +7,7 @@ config BOARD_TYAN_S2735 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 diff --git a/src/mainboard/tyan/s2735/Makefile.inc b/src/mainboard/tyan/s2735/Makefile.inc index 0d3f896..3b05dac 100644 --- a/src/mainboard/tyan/s2735/Makefile.inc +++ b/src/mainboard/tyan/s2735/Makefile.inc @@ -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 diff --git a/src/mainboard/tyan/s2735/Options.lb b/src/mainboard/tyan/s2735/Options.lb index 55c625a..61933d2 100644 --- a/src/mainboard/tyan/s2735/Options.lb +++ b/src/mainboard/tyan/s2735/Options.lb @@ -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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1 ## ## 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 diff --git a/src/mainboard/tyan/s2850/Config.lb b/src/mainboard/tyan/s2850/Config.lb index 59dcd8e..19f637f 100644 --- a/src/mainboard/tyan/s2850/Config.lb +++ b/src/mainboard/tyan/s2850/Config.lb @@ -12,8 +12,8 @@ driver mainboard.o #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 diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig index 6103be8..bb36edc 100644 --- a/src/mainboard/tyan/s2850/Kconfig +++ b/src/mainboard/tyan/s2850/Kconfig @@ -7,7 +7,8 @@ config BOARD_TYAN_S2850 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 diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb index 41590cc..a53d5b7 100644 --- a/src/mainboard/tyan/s2850/Options.lb +++ b/src/mainboard/tyan/s2850/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s2875/Config.lb b/src/mainboard/tyan/s2875/Config.lb index 7348188..63ea6be 100644 --- a/src/mainboard/tyan/s2875/Config.lb +++ b/src/mainboard/tyan/s2875/Config.lb @@ -12,8 +12,8 @@ driver mainboard.o #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 diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig index 0e04059..15fb3c6 100644 --- a/src/mainboard/tyan/s2875/Kconfig +++ b/src/mainboard/tyan/s2875/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2875 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 diff --git a/src/mainboard/tyan/s2875/Options.lb b/src/mainboard/tyan/s2875/Options.lb index df3a035..51913e3 100644 --- a/src/mainboard/tyan/s2875/Options.lb +++ b/src/mainboard/tyan/s2875/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb index 3ca46b6..692184b 100644 --- a/src/mainboard/tyan/s2880/Config.lb +++ b/src/mainboard/tyan/s2880/Config.lb @@ -12,8 +12,8 @@ driver mainboard.o #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 diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig index 01fbdf8..0caae16 100644 --- a/src/mainboard/tyan/s2880/Kconfig +++ b/src/mainboard/tyan/s2880/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2880 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 diff --git a/src/mainboard/tyan/s2880/Makefile.inc b/src/mainboard/tyan/s2880/Makefile.inc index d6fcb7b..9398e19 100644 --- a/src/mainboard/tyan/s2880/Makefile.inc +++ b/src/mainboard/tyan/s2880/Makefile.inc @@ -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 diff --git a/src/mainboard/tyan/s2880/Options.lb b/src/mainboard/tyan/s2880/Options.lb index 4255614..c41e03f 100644 --- a/src/mainboard/tyan/s2880/Options.lb +++ b/src/mainboard/tyan/s2880/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s2881/Config.lb b/src/mainboard/tyan/s2881/Config.lb index 6480067..92f50f8 100644 --- a/src/mainboard/tyan/s2881/Config.lb +++ b/src/mainboard/tyan/s2881/Config.lb @@ -12,8 +12,8 @@ driver mainboard.o #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 diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig index cf236b3..1a2bb09 100644 --- a/src/mainboard/tyan/s2881/Kconfig +++ b/src/mainboard/tyan/s2881/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2881 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 diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb index c65ef5f..cde6d5a 100644 --- a/src/mainboard/tyan/s2881/Options.lb +++ b/src/mainboard/tyan/s2881/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s2882/Config.lb b/src/mainboard/tyan/s2882/Config.lb index 6871696..34b2e82 100644 --- a/src/mainboard/tyan/s2882/Config.lb +++ b/src/mainboard/tyan/s2882/Config.lb @@ -12,8 +12,8 @@ driver mainboard.o #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 diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig index db8e17c..84c9a75 100644 --- a/src/mainboard/tyan/s2882/Kconfig +++ b/src/mainboard/tyan/s2882/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2882 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 diff --git a/src/mainboard/tyan/s2882/Makefile.inc b/src/mainboard/tyan/s2882/Makefile.inc index d6fcb7b..9398e19 100644 --- a/src/mainboard/tyan/s2882/Makefile.inc +++ b/src/mainboard/tyan/s2882/Makefile.inc @@ -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 diff --git a/src/mainboard/tyan/s2882/Options.lb b/src/mainboard/tyan/s2882/Options.lb index b17bc6b..d4ff6fe 100644 --- a/src/mainboard/tyan/s2882/Options.lb +++ b/src/mainboard/tyan/s2882/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb index 74f9c53..012b097 100644 --- a/src/mainboard/tyan/s2885/Config.lb +++ b/src/mainboard/tyan/s2885/Config.lb @@ -12,8 +12,8 @@ driver mainboard.o #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 diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig index 89a86a9..1f868bc 100644 --- a/src/mainboard/tyan/s2885/Kconfig +++ b/src/mainboard/tyan/s2885/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2885 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 diff --git a/src/mainboard/tyan/s2885/Options.lb b/src/mainboard/tyan/s2885/Options.lb index cacfc72..df76f5c 100644 --- a/src/mainboard/tyan/s2885/Options.lb +++ b/src/mainboard/tyan/s2885/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s2891/Config.lb b/src/mainboard/tyan/s2891/Config.lb index 2266929..3f051a0 100644 --- a/src/mainboard/tyan/s2891/Config.lb +++ b/src/mainboard/tyan/s2891/Config.lb @@ -16,11 +16,11 @@ 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 #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" diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig index 98defd5..535b0f2 100644 --- a/src/mainboard/tyan/s2891/Kconfig +++ b/src/mainboard/tyan/s2891/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2891 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 diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb index 9822e39..08a1a08 100644 --- a/src/mainboard/tyan/s2891/Options.lb +++ b/src/mainboard/tyan/s2891/Options.lb @@ -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_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_LOW_TABLES uses CONFIG_MULTIBOOT @@ -109,19 +109,19 @@ default CONFIG_HAVE_SMI_HANDLER=0 ## ## 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 diff --git a/src/mainboard/tyan/s2892/Config.lb b/src/mainboard/tyan/s2892/Config.lb index 3779de2..9dcb7da 100644 --- a/src/mainboard/tyan/s2892/Config.lb +++ b/src/mainboard/tyan/s2892/Config.lb @@ -17,11 +17,11 @@ 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 #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" diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig index 72986e5..421dc2e 100644 --- a/src/mainboard/tyan/s2892/Kconfig +++ b/src/mainboard/tyan/s2892/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2892 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 diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb index 5079f54..4ec42e5 100644 --- a/src/mainboard/tyan/s2892/Options.lb +++ b/src/mainboard/tyan/s2892/Options.lb @@ -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_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_LOW_TABLES uses CONFIG_MULTIBOOT @@ -103,19 +103,19 @@ default CONFIG_HAVE_SMI_HANDLER=0 ## ## 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 diff --git a/src/mainboard/tyan/s2895/Config.lb b/src/mainboard/tyan/s2895/Config.lb index 911e279..c4f24f4 100644 --- a/src/mainboard/tyan/s2895/Config.lb +++ b/src/mainboard/tyan/s2895/Config.lb @@ -12,11 +12,11 @@ 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 #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" diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig index e34ed1d..1242741 100644 --- a/src/mainboard/tyan/s2895/Kconfig +++ b/src/mainboard/tyan/s2895/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2895 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 diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb index 499f269..de9e136 100644 --- a/src/mainboard/tyan/s2895/Options.lb +++ b/src/mainboard/tyan/s2895/Options.lb @@ -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_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_LOW_TABLES uses CONFIG_MULTIBOOT @@ -116,19 +116,19 @@ default CONFIG_HAVE_SMI_HANDLER=0 ## ## 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 diff --git a/src/mainboard/tyan/s2912/Config.lb b/src/mainboard/tyan/s2912/Config.lb index c8f3a8f..a52a70b 100644 --- a/src/mainboard/tyan/s2912/Config.lb +++ b/src/mainboard/tyan/s2912/Config.lb @@ -33,8 +33,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig index ff05979..f85fc02 100644 --- a/src/mainboard/tyan/s2912/Kconfig +++ b/src/mainboard/tyan/s2912/Kconfig @@ -8,11 +8,11 @@ config BOARD_TYAN_S2912 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 diff --git a/src/mainboard/tyan/s2912/Makefile.inc b/src/mainboard/tyan/s2912/Makefile.inc index 83271c2..acfa14f 100644 --- a/src/mainboard/tyan/s2912/Makefile.inc +++ b/src/mainboard/tyan/s2912/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o #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 diff --git a/src/mainboard/tyan/s2912/Options.lb b/src/mainboard/tyan/s2912/Options.lb index 83c7424..439c6cf 100644 --- a/src/mainboard/tyan/s2912/Options.lb +++ b/src/mainboard/tyan/s2912/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s2912_fam10/Config.lb b/src/mainboard/tyan/s2912_fam10/Config.lb index be6662f..84f6d1c 100644 --- a/src/mainboard/tyan/s2912_fam10/Config.lb +++ b/src/mainboard/tyan/s2912_fam10/Config.lb @@ -33,8 +33,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 #object reset.o if CONFIG_USE_INIT diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig index 9b1eb2a..c2e2202 100644 --- a/src/mainboard/tyan/s2912_fam10/Kconfig +++ b/src/mainboard/tyan/s2912_fam10/Kconfig @@ -8,7 +8,8 @@ config BOARD_TYAN_S2912_FAM10 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 diff --git a/src/mainboard/tyan/s2912_fam10/Makefile.inc b/src/mainboard/tyan/s2912_fam10/Makefile.inc index 83271c2..acfa14f 100644 --- a/src/mainboard/tyan/s2912_fam10/Makefile.inc +++ b/src/mainboard/tyan/s2912_fam10/Makefile.inc @@ -23,8 +23,8 @@ driver-y += mainboard.o #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 diff --git a/src/mainboard/tyan/s2912_fam10/Options.lb b/src/mainboard/tyan/s2912_fam10/Options.lb index 3c7cc84..61c647c 100644 --- a/src/mainboard/tyan/s2912_fam10/Options.lb +++ b/src/mainboard/tyan/s2912_fam10/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s4880/Config.lb b/src/mainboard/tyan/s4880/Config.lb index c85db4b..1838733 100644 --- a/src/mainboard/tyan/s4880/Config.lb +++ b/src/mainboard/tyan/s4880/Config.lb @@ -11,8 +11,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 if CONFIG_USE_INIT diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig index 1a0c9fe..bc68364 100644 --- a/src/mainboard/tyan/s4880/Kconfig +++ b/src/mainboard/tyan/s4880/Kconfig @@ -9,6 +9,7 @@ config BOARD_TYAN_S4880 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 diff --git a/src/mainboard/tyan/s4880/Makefile.inc b/src/mainboard/tyan/s4880/Makefile.inc index 86d71e1..c382cc6 100644 --- a/src/mainboard/tyan/s4880/Makefile.inc +++ b/src/mainboard/tyan/s4880/Makefile.inc @@ -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. diff --git a/src/mainboard/tyan/s4880/Options.lb b/src/mainboard/tyan/s4880/Options.lb index a238c0a..05490b7 100644 --- a/src/mainboard/tyan/s4880/Options.lb +++ b/src/mainboard/tyan/s4880/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/tyan/s4882/Config.lb b/src/mainboard/tyan/s4882/Config.lb index 7da0a67..f28c752 100644 --- a/src/mainboard/tyan/s4882/Config.lb +++ b/src/mainboard/tyan/s4882/Config.lb @@ -11,8 +11,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 if CONFIG_USE_INIT diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig index af52ebd..fc67007 100644 --- a/src/mainboard/tyan/s4882/Kconfig +++ b/src/mainboard/tyan/s4882/Kconfig @@ -9,6 +9,7 @@ config BOARD_TYAN_S4882 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 diff --git a/src/mainboard/tyan/s4882/Makefile.inc b/src/mainboard/tyan/s4882/Makefile.inc index 86d71e1..c382cc6 100644 --- a/src/mainboard/tyan/s4882/Makefile.inc +++ b/src/mainboard/tyan/s4882/Makefile.inc @@ -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. diff --git a/src/mainboard/tyan/s4882/Options.lb b/src/mainboard/tyan/s4882/Options.lb index 169b85c..820fc3b 100644 --- a/src/mainboard/tyan/s4882/Options.lb +++ b/src/mainboard/tyan/s4882/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/mainboard/via/epia-cn/Config.lb b/src/mainboard/via/epia-cn/Config.lb index 5e3149e..dbb9c32 100644 --- a/src/mainboard/via/epia-cn/Config.lb +++ b/src/mainboard/via/epia-cn/Config.lb @@ -25,9 +25,9 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/via/epia-cn/Makefile.inc b/src/mainboard/via/epia-cn/Makefile.inc index eb24017..61c662d 100644 --- a/src/mainboard/via/epia-cn/Makefile.inc +++ b/src/mainboard/via/epia-cn/Makefile.inc @@ -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 diff --git a/src/mainboard/via/epia-cn/Options.lb b/src/mainboard/via/epia-cn/Options.lb index 427f438..700de54 100644 --- a/src/mainboard/via/epia-cn/Options.lb +++ b/src/mainboard/via/epia-cn/Options.lb @@ -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_ROMBASE 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_CONSOLE_SERIAL8250 = 1 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 diff --git a/src/mainboard/via/epia-m/Config.lb b/src/mainboard/via/epia-m/Config.lb index a81c758..5d48aeb 100644 --- a/src/mainboard/via/epia-m/Config.lb +++ b/src/mainboard/via/epia-m/Config.lb @@ -14,11 +14,11 @@ 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 object vgabios.o -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object fadt.o object dsdt.o object acpi_tables.o diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc index b029d1e..b84a5bc 100644 --- a/src/mainboard/via/epia-m/Makefile.inc +++ b/src/mainboard/via/epia-m/Makefile.inc @@ -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 diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb index 9166925..901da5b 100644 --- a/src/mainboard/via/epia-m/Options.lb +++ b/src/mainboard/via/epia-m/Options.lb @@ -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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## no MP table ## -default CONFIG_HAVE_MP_TABLE=0 +default CONFIG_GENERATE_MP_TABLE=0 ## ## Use TSC for udelay. @@ -77,14 +77,14 @@ default CONFIG_HAVE_HARD_RESET=0 ## ## 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 ## diff --git a/src/mainboard/via/epia-m700/Config.lb b/src/mainboard/via/epia-m700/Config.lb index 06eb3d0..edd246a 100644 --- a/src/mainboard/via/epia-m700/Config.lb +++ b/src/mainboard/via/epia-m700/Config.lb @@ -25,9 +25,9 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig index e31212c..0d451c7 100644 --- a/src/mainboard/via/epia-m700/Kconfig +++ b/src/mainboard/via/epia-m700/Kconfig @@ -4,7 +4,6 @@ config BOARD_VIA_EPIA_M700 select CPU_VIA_C7 select NORTHBRIDGE_VIA_VX800 select SUPERIO_WINBOND_W83697HF - select HAVE_PIRQ_TABLE select HAVE_ACPI_TABLES config MAINBOARD_DIR diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc index dd8ab50..e0528f6 100644 --- a/src/mainboard/via/epia-m700/Makefile.inc +++ b/src/mainboard/via/epia-m700/Makefile.inc @@ -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 diff --git a/src/mainboard/via/epia-m700/Options.lb b/src/mainboard/via/epia-m700/Options.lb index f88cd92..5aa8473 100644 --- a/src/mainboard/via/epia-m700/Options.lb +++ b/src/mainboard/via/epia-m700/Options.lb @@ -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_ROMBASE 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_CONSOLE_SERIAL8250 = 1 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 diff --git a/src/mainboard/via/epia-m700/acpi_tables.c b/src/mainboard/via/epia-m700/acpi_tables.c index fefe7b6..298dc19 100644 --- a/src/mainboard/via/epia-m700/acpi_tables.c +++ b/src/mainboard/via/epia-m700/acpi_tables.c @@ -43,9 +43,9 @@ extern u8 acpi_sleep_type; /* * 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 diff --git a/src/mainboard/via/epia-n/Config.lb b/src/mainboard/via/epia-n/Config.lb index 473b0d4..7237732 100644 --- a/src/mainboard/via/epia-n/Config.lb +++ b/src/mainboard/via/epia-n/Config.lb @@ -34,13 +34,13 @@ 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 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" diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig index 4087336..26593f1 100644 --- a/src/mainboard/via/epia-n/Kconfig +++ b/src/mainboard/via/epia-n/Kconfig @@ -6,6 +6,7 @@ config BOARD_VIA_EPIA_N select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_WINBOND_W83697HF select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select EPIA_VT8237R_INIT select HAVE_ACPI_TABLES diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc index a1576c8..0b4e3b1 100644 --- a/src/mainboard/via/epia-n/Makefile.inc +++ b/src/mainboard/via/epia-n/Makefile.inc @@ -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 diff --git a/src/mainboard/via/epia-n/Options.lb b/src/mainboard/via/epia-n/Options.lb index b1a14df..e9dfad1 100644 --- a/src/mainboard/via/epia-n/Options.lb +++ b/src/mainboard/via/epia-n/Options.lb @@ -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_RAMBASE 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_HAVE_FAILOVER_BOOT = 0 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 diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c index 57e648f..b5d19c8 100644 --- a/src/mainboard/via/epia-n/acpi_tables.c +++ b/src/mainboard/via/epia-n/acpi_tables.c @@ -39,9 +39,9 @@ extern unsigned char AmlCode[]; /* * 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 diff --git a/src/mainboard/via/epia/Config.lb b/src/mainboard/via/epia/Config.lb index 40d88f9..8c339b2 100644 --- a/src/mainboard/via/epia/Config.lb +++ b/src/mainboard/via/epia/Config.lb @@ -13,7 +13,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 ## diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc index cadb476..0b1067d 100644 --- a/src/mainboard/via/epia/Makefile.inc +++ b/src/mainboard/via/epia/Makefile.inc @@ -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 diff --git a/src/mainboard/via/epia/Options.lb b/src/mainboard/via/epia/Options.lb index 9dfb2b3..1e0e178 100644 --- a/src/mainboard/via/epia/Options.lb +++ b/src/mainboard/via/epia/Options.lb @@ -4,8 +4,8 @@ uses CONFIG_CONSOLE_SERIAL8250 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_ROMBASE 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 @@ default CONFIG_HAVE_FALLBACK_BOOT=1 ## ## 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 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=0 ## ## 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 diff --git a/src/mainboard/via/pc2500e/Config.lb b/src/mainboard/via/pc2500e/Config.lb index 93ea99b..09e3419 100644 --- a/src/mainboard/via/pc2500e/Config.lb +++ b/src/mainboard/via/pc2500e/Config.lb @@ -24,9 +24,9 @@ include /config/nofailovercalculation.lb 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 diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig index 475386f..b0e18d2 100644 --- a/src/mainboard/via/pc2500e/Kconfig +++ b/src/mainboard/via/pc2500e/Kconfig @@ -6,6 +6,7 @@ config BOARD_VIA_PC2500E select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_ITE_IT8716F select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE config MAINBOARD_DIR string diff --git a/src/mainboard/via/pc2500e/Makefile.inc b/src/mainboard/via/pc2500e/Makefile.inc index eb24017..61c662d 100644 --- a/src/mainboard/via/pc2500e/Makefile.inc +++ b/src/mainboard/via/pc2500e/Makefile.inc @@ -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 diff --git a/src/mainboard/via/pc2500e/Options.lb b/src/mainboard/via/pc2500e/Options.lb index 75dbecb..c71e792 100644 --- a/src/mainboard/via/pc2500e/Options.lb +++ b/src/mainboard/via/pc2500e/Options.lb @@ -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_ROMBASE 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_PCI_ROM_RUN = 0 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" diff --git a/src/mainboard/via/vt8454c/Config.lb b/src/mainboard/via/vt8454c/Config.lb index 9860ba6..ab4fc3c 100644 --- a/src/mainboard/via/vt8454c/Config.lb +++ b/src/mainboard/via/vt8454c/Config.lb @@ -35,15 +35,15 @@ arch i386 end 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 diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index 2f44226..ca3650d 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -6,6 +6,7 @@ config BOARD_VIA_VT8454C # 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 diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc index f33336b..318d81f 100644 --- a/src/mainboard/via/vt8454c/Makefile.inc +++ b/src/mainboard/via/vt8454c/Makefile.inc @@ -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 diff --git a/src/mainboard/via/vt8454c/Options.lb b/src/mainboard/via/vt8454c/Options.lb index 310235a..0d84d5f 100644 --- a/src/mainboard/via/vt8454c/Options.lb +++ b/src/mainboard/via/vt8454c/Options.lb @@ -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 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## 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 diff --git a/src/northbridge/amd/amdfam10/Config.lb b/src/northbridge/amd/amdfam10/Config.lb index f217fcd..27c3625 100644 --- a/src/northbridge/amd/amdfam10/Config.lb +++ b/src/northbridge/amd/amdfam10/Config.lb @@ -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" diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc index 9cca322..bcc7cab 100644 --- a/src/northbridge/amd/amdfam10/Makefile.inc +++ b/src/northbridge/amd/amdfam10/Makefile.inc @@ -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 diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index 44fa9e4..52ec019 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -877,7 +877,7 @@ static void disable_hoist_memory(unsigned long hole_startk, int i) #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 @@ static void pci_domain_set_resources(device_t dev) 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 @@ static void pci_domain_set_resources(device_t dev) } 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) { diff --git a/src/northbridge/amd/amdk8/Config.lb b/src/northbridge/amd/amdk8/Config.lb index 149a542..d9a3ac5 100644 --- a/src/northbridge/amd/amdk8/Config.lb +++ b/src/northbridge/amd/amdk8/Config.lb @@ -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 end -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object amdk8_acpi.o end diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc index 716e38c..9053404 100644 --- a/src/northbridge/amd/amdk8/Makefile.inc +++ b/src/northbridge/amd/amdk8/Makefile.inc @@ -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. diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index aa620c5..a252e08 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -836,7 +836,7 @@ static uint32_t hoist_memory(unsigned long hole_startk, int node_id) } #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 @@ static void amdk8_domain_set_resources(device_t dev) 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 @@ static void amdk8_domain_set_resources(device_t dev) 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) { diff --git a/src/northbridge/amd/gx1/Config.lb b/src/northbridge/amd/gx1/Config.lb index 18b426d..55a986e 100644 --- a/src/northbridge/amd/gx1/Config.lb +++ b/src/northbridge/amd/gx1/Config.lb @@ -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 diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c index d8e80c2..b652ffa 100644 --- a/src/northbridge/amd/gx1/northbridge.c +++ b/src/northbridge/amd/gx1/northbridge.c @@ -105,7 +105,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/amd/gx2/Config.lb b/src/northbridge/amd/gx2/Config.lb index 169db63..0bba6ce 100644 --- a/src/northbridge/amd/gx2/Config.lb +++ b/src/northbridge/amd/gx2/Config.lb @@ -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 diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c index f6e862a..b20d3d7 100644 --- a/src/northbridge/amd/gx2/northbridge.c +++ b/src/northbridge/amd/gx2/northbridge.c @@ -476,7 +476,7 @@ static struct device_operations cpu_bus_ops = { 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 @@ static void enable_dev(struct device *dev) 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; diff --git a/src/northbridge/amd/lx/Config.lb b/src/northbridge/amd/lx/Config.lb index 340d3df..23d466f 100644 --- a/src/northbridge/amd/lx/Config.lb +++ b/src/northbridge/amd/lx/Config.lb @@ -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 diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c index b267084..adc5db1 100644 --- a/src/northbridge/amd/lx/northbridge.c +++ b/src/northbridge/amd/lx/northbridge.c @@ -395,7 +395,7 @@ static void ram_resource(device_t dev, unsigned long index, 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 @@ static void pci_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/intel/e7501/Config.lb b/src/northbridge/intel/e7501/Config.lb index 72e903b..267986d 100644 --- a/src/northbridge/intel/e7501/Config.lb +++ b/src/northbridge/intel/e7501/Config.lb @@ -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 diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c index ee5f62f..c3b373c 100644 --- a/src/northbridge/intel/e7501/northbridge.c +++ b/src/northbridge/intel/e7501/northbridge.c @@ -48,7 +48,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) (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; diff --git a/src/northbridge/intel/e7520/Config.lb b/src/northbridge/intel/e7520/Config.lb index 327b379..a67b45c 100644 --- a/src/northbridge/intel/e7520/Config.lb +++ b/src/northbridge/intel/e7520/Config.lb @@ -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_porta1.o 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" diff --git a/src/northbridge/intel/e7520/northbridge.c b/src/northbridge/intel/e7520/northbridge.c index da3d71b..fd9b094 100644 --- a/src/northbridge/intel/e7520/northbridge.c +++ b/src/northbridge/intel/e7520/northbridge.c @@ -52,7 +52,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) (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; diff --git a/src/northbridge/intel/e7525/Config.lb b/src/northbridge/intel/e7525/Config.lb index 3f2738b..0cc8899 100644 --- a/src/northbridge/intel/e7525/Config.lb +++ b/src/northbridge/intel/e7525/Config.lb @@ -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_porta1.o 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" diff --git a/src/northbridge/intel/e7525/northbridge.c b/src/northbridge/intel/e7525/northbridge.c index 1963a0d..3c483a1 100644 --- a/src/northbridge/intel/e7525/northbridge.c +++ b/src/northbridge/intel/e7525/northbridge.c @@ -52,7 +52,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) (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; diff --git a/src/northbridge/intel/i3100/Config.lb b/src/northbridge/intel/i3100/Config.lb index ac100c5..3bbe0f2 100644 --- a/src/northbridge/intel/i3100/Config.lb +++ b/src/northbridge/intel/i3100/Config.lb @@ -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 northbridge.o driver pciexp_porta.o driver pciexp_porta_ep80579.o -default CONFIG_HAVE_HIGH_TABLES=1 +default CONFIG_WRITE_HIGH_TABLES=1 diff --git a/src/northbridge/intel/i3100/northbridge.c b/src/northbridge/intel/i3100/northbridge.c index c96dcee..4e9bf27 100644 --- a/src/northbridge/intel/i3100/northbridge.c +++ b/src/northbridge/intel/i3100/northbridge.c @@ -73,7 +73,7 @@ static u32 find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) (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; diff --git a/src/northbridge/intel/i440bx/Config.lb b/src/northbridge/intel/i440bx/Config.lb index a27625e..fb23caa 100644 --- a/src/northbridge/intel/i440bx/Config.lb +++ b/src/northbridge/intel/i440bx/Config.lb @@ -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 diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c index 05c614c..26229a9 100644 --- a/src/northbridge/intel/i440bx/northbridge.c +++ b/src/northbridge/intel/i440bx/northbridge.c @@ -72,7 +72,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void i440bx_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/intel/i82810/Config.lb b/src/northbridge/intel/i82810/Config.lb index 2cc66fc..27dcc62 100644 --- a/src/northbridge/intel/i82810/Config.lb +++ b/src/northbridge/intel/i82810/Config.lb @@ -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 diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c index 22ea99e..16be66e 100644 --- a/src/northbridge/intel/i82810/northbridge.c +++ b/src/northbridge/intel/i82810/northbridge.c @@ -109,7 +109,7 @@ static int translate_i82810_to_mb[] = { /* 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 @@ static void pci_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/intel/i82830/Config.lb b/src/northbridge/intel/i82830/Config.lb index c6b7afd..f1bd3b9 100644 --- a/src/northbridge/intel/i82830/Config.lb +++ b/src/northbridge/intel/i82830/Config.lb @@ -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 diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c index 2b913ea..6b50dc5 100644 --- a/src/northbridge/intel/i82830/northbridge.c +++ b/src/northbridge/intel/i82830/northbridge.c @@ -88,7 +88,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/intel/i855gme/Config.lb b/src/northbridge/intel/i855gme/Config.lb index 0463480..861a91d 100644 --- a/src/northbridge/intel/i855gme/Config.lb +++ b/src/northbridge/intel/i855gme/Config.lb @@ -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 diff --git a/src/northbridge/intel/i855gme/northbridge.c b/src/northbridge/intel/i855gme/northbridge.c index 5ad2122..932409a 100644 --- a/src/northbridge/intel/i855gme/northbridge.c +++ b/src/northbridge/intel/i855gme/northbridge.c @@ -70,7 +70,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) /* 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; diff --git a/src/northbridge/intel/i855pm/Config.lb b/src/northbridge/intel/i855pm/Config.lb index 72e903b..267986d 100644 --- a/src/northbridge/intel/i855pm/Config.lb +++ b/src/northbridge/intel/i855pm/Config.lb @@ -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 diff --git a/src/northbridge/intel/i855pm/northbridge.c b/src/northbridge/intel/i855pm/northbridge.c index f6a2391..ded93ba 100644 --- a/src/northbridge/intel/i855pm/northbridge.c +++ b/src/northbridge/intel/i855pm/northbridge.c @@ -49,7 +49,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/intel/i945/Config.lb b/src/northbridge/intel/i945/Config.lb index 8a6fc21..8d2d861 100644 --- a/src/northbridge/intel/i945/Config.lb +++ b/src/northbridge/intel/i945/Config.lb @@ -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 diff --git a/src/northbridge/intel/i945/Makefile.inc b/src/northbridge/intel/i945/Makefile.inc index 0b3888c..5447e44 100644 --- a/src/northbridge/intel/i945/Makefile.inc +++ b/src/northbridge/intel/i945/Makefile.inc @@ -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 diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 5bc1025..b2851cd 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -126,7 +126,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/via/cn400/Config.lb b/src/northbridge/via/cn400/Config.lb index b0704b9..2f89072 100644 --- a/src/northbridge/via/cn400/Config.lb +++ b/src/northbridge/via/cn400/Config.lb @@ -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 agp.o driver vga.o driver vlink.o -default CONFIG_HAVE_HIGH_TABLES=1 +default CONFIG_WRITE_HIGH_TABLES=1 diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c index 9594182..86dea8d 100644 --- a/src/northbridge/via/cn400/northbridge.c +++ b/src/northbridge/via/cn400/northbridge.c @@ -218,7 +218,7 @@ static u32 find_pci_tolm(struct bus *bus) 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 @@ static void cn400_domain_set_resources(device_t dev) 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; diff --git a/src/northbridge/via/cn700/Config.lb b/src/northbridge/via/cn700/Config.lb index e79e0e0..da312e6 100644 --- a/src/northbridge/via/cn700/Config.lb +++ b/src/northbridge/via/cn700/Config.lb @@ -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 northbridge.o driver agp.o driver vga.o -default CONFIG_HAVE_HIGH_TABLES=1 +default CONFIG_WRITE_HIGH_TABLES=1 diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c index ec78870..db0a1cf 100644 --- a/src/northbridge/via/cn700/northbridge.c +++ b/src/northbridge/via/cn700/northbridge.c @@ -142,7 +142,7 @@ static u32 find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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); diff --git a/src/northbridge/via/cx700/Config.lb b/src/northbridge/via/cx700/Config.lb index 8f87759..347069e 100644 --- a/src/northbridge/via/cx700/Config.lb +++ b/src/northbridge/via/cx700/Config.lb @@ -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_lpc.o driver cx700_sata.o driver cx700_vga.o -default CONFIG_HAVE_HIGH_TABLES=1 +default CONFIG_WRITE_HIGH_TABLES=1 diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c index 82ea062..b08dc17 100644 --- a/src/northbridge/via/cx700/northbridge.c +++ b/src/northbridge/via/cx700/northbridge.c @@ -72,7 +72,7 @@ static u32 find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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); diff --git a/src/northbridge/via/vt8601/Config.lb b/src/northbridge/via/vt8601/Config.lb index 1523f98..79e340b 100644 --- a/src/northbridge/via/vt8601/Config.lb +++ b/src/northbridge/via/vt8601/Config.lb @@ -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 diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c index 8fb82f0..d56456e 100644 --- a/src/northbridge/via/vt8601/northbridge.c +++ b/src/northbridge/via/vt8601/northbridge.c @@ -84,7 +84,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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); diff --git a/src/northbridge/via/vt8623/Config.lb b/src/northbridge/via/vt8623/Config.lb index 1523f98..79e340b 100644 --- a/src/northbridge/via/vt8623/Config.lb +++ b/src/northbridge/via/vt8623/Config.lb @@ -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 diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c index e0ad3a8..d384a98 100644 --- a/src/northbridge/via/vt8623/northbridge.c +++ b/src/northbridge/via/vt8623/northbridge.c @@ -229,7 +229,7 @@ static uint32_t find_pci_tolm(struct bus *bus) 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 @@ static void pci_domain_set_resources(device_t dev) 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); diff --git a/src/southbridge/amd/amd8111/amd8111_acpi.c b/src/southbridge/amd/amd8111/amd8111_acpi.c index 9511474..f318b37 100644 --- a/src/southbridge/amd/amd8111/amd8111_acpi.c +++ b/src/southbridge/amd/amd8111/amd8111_acpi.c @@ -66,7 +66,7 @@ static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val) 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 @@ static void acpi_init(struct device *dev) (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 diff --git a/src/southbridge/amd/cs5530/cs5530_pirq.c b/src/southbridge/amd/cs5530/cs5530_pirq.c index 3fb9a74..693f7c4 100644 --- a/src/southbridge/amd/cs5530/cs5530_pirq.c +++ b/src/southbridge/amd/cs5530/cs5530_pirq.c @@ -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; diff --git a/src/southbridge/amd/cs5536/cs5536_pirq.c b/src/southbridge/amd/cs5536/cs5536_pirq.c index 0723253..b2ae1fe 100644 --- a/src/southbridge/amd/cs5536/cs5536_pirq.c +++ b/src/southbridge/amd/cs5536/cs5536_pirq.c @@ -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; diff --git a/src/southbridge/nvidia/ck804/Config.lb b/src/southbridge/nvidia/ck804/Config.lb index 3668298..89bd0e0 100644 --- a/src/southbridge/nvidia/ck804/Config.lb +++ b/src/southbridge/nvidia/ck804/Config.lb @@ -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_pcie.o driver ck804_ht.o object ck804_reset.o -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object ck804_fadt.o end diff --git a/src/southbridge/nvidia/ck804/Makefile.inc b/src/southbridge/nvidia/ck804/Makefile.inc index 7c4ea9b..addc84b 100644 --- a/src/southbridge/nvidia/ck804/Makefile.inc +++ b/src/southbridge/nvidia/ck804/Makefile.inc @@ -13,4 +13,4 @@ driver-y += ck804_ht.o obj-y += ck804_reset.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += ck804_fadt.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += ck804_fadt.o diff --git a/src/southbridge/nvidia/mcp55/Config.lb b/src/southbridge/nvidia/mcp55/Config.lb index 492cd3f..117cc51 100644 --- a/src/southbridge/nvidia/mcp55/Config.lb +++ b/src/southbridge/nvidia/mcp55/Config.lb @@ -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_pci.o 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 diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc index c7f8396..4b5ee8e 100644 --- a/src/southbridge/nvidia/mcp55/Makefile.inc +++ b/src/southbridge/nvidia/mcp55/Makefile.inc @@ -11,6 +11,6 @@ driver-y += mcp55_smbus.o 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 diff --git a/src/southbridge/nvidia/mcp55/mcp55_smbus.c b/src/southbridge/nvidia/mcp55/mcp55_smbus.c index 484702a..38f757e 100644 --- a/src/southbridge/nvidia/mcp55/mcp55_smbus.c +++ b/src/southbridge/nvidia/mcp55/mcp55_smbus.c @@ -94,7 +94,7 @@ static struct smbus_bus_operations lops_smbus_bus = { .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_read_resources(device_t dev) 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); diff --git a/src/southbridge/via/k8t890/k8t890_dram.c b/src/southbridge/via/k8t890/k8t890_dram.c index 3a5d97a..1f9c7d6 100644 --- a/src/southbridge/via/k8t890/k8t890_dram.c +++ b/src/southbridge/via/k8t890/k8t890_dram.c @@ -92,7 +92,7 @@ static void get_memres(void *gp, struct device *dev, struct resource *res) (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; diff --git a/src/southbridge/via/vt8237r/Config.lb b/src/southbridge/via/vt8237r/Config.lb index 93e88c2..b760ec2 100644 --- a/src/southbridge/via/vt8237r/Config.lb +++ b/src/southbridge/via/vt8237r/Config.lb @@ -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_lpc.o 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 diff --git a/src/southbridge/via/vt8237r/Makefile.inc b/src/southbridge/via/vt8237r/Makefile.inc index 1eb7cba..0842074 100644 --- a/src/southbridge/via/vt8237r/Makefile.inc +++ b/src/southbridge/via/vt8237r/Makefile.inc @@ -24,4 +24,4 @@ driver-y += vt8237r_lpc.o 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 |
