diff options
Diffstat (limited to 'src/mainboard/via/pc2500e')
| -rw-r--r-- | src/mainboard/via/pc2500e/Config.lb | 6 | ||||
| -rw-r--r-- | src/mainboard/via/pc2500e/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/via/pc2500e/Makefile.inc | 10 | ||||
| -rw-r--r-- | src/mainboard/via/pc2500e/Options.lb | 14 |
4 files changed, 16 insertions, 15 deletions
diff --git a/src/mainboard/via/pc2500e/Config.lb b/src/mainboard/via/pc2500e/Config.lb index 93ea99b489..09e3419b74 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 475386f423..b0e18d2c4e 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 eb24017e8e..61c662d784 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 75dbecbd01..c71e792e24 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" |