From 9ea7bff22ecaba50eefd817dd74d092120682f1a Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 28 Feb 2010 18:23:00 +0000 Subject: - Add config flag for boards that have their own fadt.c This should eventually go, as fadt seems to be better put into the southbridge - Add config flag for boards that have get_bus_conf.c Might be cleaned out as well, no idea - Use flags where appropriate. - Move the following rules to src/arch/i386/Makefile.inc: - fadt.o - dsdt.o - acpi_tables.o - get_bus_conf.o - Rename objs_dsl_template in toplevel Makefile to the more appropriate objs_asl_template - Remove all Makefiles that are empty now, which includes src/mainboard/Makefile.k8_CAR.inc and src/mainboard/Makefile.k8_ck804.inc and the include statements that used these files. - Add workaround to intel/xe7501devkit: It uses ACPI in an unusual way: It adds a MADT, but no DSDT. As this is highly unusual, I didn't want to add explicit support for that scenario (and encourage such uses that way), and added a dummy dsdt.asl instead. It will be linked to dsdt.o, but not linked into the final binary. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5171 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/intel/d945gclf/Kconfig | 1 + src/mainboard/intel/d945gclf/Makefile.inc | 3 --- src/mainboard/intel/eagleheights/Kconfig | 1 + src/mainboard/intel/eagleheights/Makefile.inc | 3 --- src/mainboard/intel/xe7501devkit/Makefile.inc | 1 - src/mainboard/intel/xe7501devkit/dsdt.asl | 16 ++++++++++++++++ 6 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 src/mainboard/intel/eagleheights/Makefile.inc create mode 100644 src/mainboard/intel/xe7501devkit/dsdt.asl (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index 261989a4a1..4532b5c8b2 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/src/mainboard/intel/d945gclf/Kconfig @@ -25,6 +25,7 @@ config BOARD_INTEL_D945GCLF select NORTHBRIDGE_INTEL_I945 select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_SMSC_LPC47M15X + select BOARD_HAS_FADT select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc index 9516e9ea21..a74b1d7552 100644 --- a/src/mainboard/intel/d945gclf/Makefile.inc +++ b/src/mainboard/intel/d945gclf/Makefile.inc @@ -23,8 +23,5 @@ obj-y += rtl8168.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/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig index 45b173f1bb..d57834a507 100644 --- a/src/mainboard/intel/eagleheights/Kconfig +++ b/src/mainboard/intel/eagleheights/Kconfig @@ -8,6 +8,7 @@ config BOARD_INTEL_EAGLEHEIGHTS select SUPERIO_SMSC_SMSCSUPERIO select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET + select BOARD_HAS_FADT select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select MMCONF_SUPPORT diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc deleted file mode 100644 index 3eaf840d9c..0000000000 --- a/src/mainboard/intel/eagleheights/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc index 4878dc3ff9..0f285cdfed 100644 --- a/src/mainboard/intel/xe7501devkit/Makefile.inc +++ b/src/mainboard/intel/xe7501devkit/Makefile.inc @@ -1,2 +1 @@ ROMCCFLAGS := -mcpu=p4 -O2 -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/intel/xe7501devkit/dsdt.asl b/src/mainboard/intel/xe7501devkit/dsdt.asl new file mode 100644 index 0000000000..360db882c4 --- /dev/null +++ b/src/mainboard/intel/xe7501devkit/dsdt.asl @@ -0,0 +1,16 @@ +/* This is a dummy dsdt. Normal ACPI requires a DSDT, but in this case, ACPI + is just a workaround for QNX. It would be nice to eventually have a real + dsdt here. + Note: It will not be hooked up at runtime. It won't even get linked. + But we still need this file. */ + +DefinitionBlock( + "dsdt.aml", + "DSDT", + 0x02, // DSDT revision: ACPI v2.0 + "COREv2", // OEM id + "COREBOOT", // OEM table id + 0x20090419 // OEM revision +) +{ +} -- cgit v1.2.3