diff options
Diffstat (limited to 'src/mainboard/via/epia-m700')
| -rw-r--r-- | src/mainboard/via/epia-m700/Config.lb | 6 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/Makefile.inc | 10 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/Options.lb | 14 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/acpi_tables.c | 4 |
5 files changed, 17 insertions, 18 deletions
diff --git a/src/mainboard/via/epia-m700/Config.lb b/src/mainboard/via/epia-m700/Config.lb index 06eb3d0972..edd246aaf4 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 e31212c561..0d451c7141 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 dd8ab50202..e0528f6925 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 f88cd928f7..5aa8473ec2 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 fefe7b6520..298dc19c96 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 |