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/msi/ms7135/Kconfig | 1 + src/mainboard/msi/ms7135/Makefile.inc | 1 - src/mainboard/msi/ms7260/Kconfig | 1 + src/mainboard/msi/ms7260/Makefile.inc | 1 - src/mainboard/msi/ms9185/Kconfig | 1 + src/mainboard/msi/ms9185/Makefile.inc | 3 --- src/mainboard/msi/ms9282/Kconfig | 1 + src/mainboard/msi/ms9282/Makefile.inc | 1 - 8 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 src/mainboard/msi/ms7135/Makefile.inc delete mode 100644 src/mainboard/msi/ms9185/Makefile.inc (limited to 'src/mainboard/msi') diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig index 81e4bbb4a6..95cda6e2ee 100644 --- a/src/mainboard/msi/ms7135/Kconfig +++ b/src/mainboard/msi/ms7135/Kconfig @@ -6,6 +6,7 @@ config BOARD_MSI_MS7135 select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_CK804 select SUPERIO_WINBOND_W83627THF + select HAVE_BUS_CONFIG select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/msi/ms7135/Makefile.inc b/src/mainboard/msi/ms7135/Makefile.inc deleted file mode 100644 index 53cb4fcdcf..0000000000 --- a/src/mainboard/msi/ms7135/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_ck804.inc diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig index 929433aade..f6b593e828 100644 --- a/src/mainboard/msi/ms7260/Kconfig +++ b/src/mainboard/msi/ms7260/Kconfig @@ -6,6 +6,7 @@ config BOARD_MSI_MS7260 select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627EHG + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/msi/ms7260/Makefile.inc b/src/mainboard/msi/ms7260/Makefile.inc index 271e9fe547..9c0156e9dd 100644 --- a/src/mainboard/msi/ms7260/Makefile.inc +++ b/src/mainboard/msi/ms7260/Makefile.inc @@ -18,6 +18,5 @@ ## #needed by irq_tables and mptable and acpi_tables -obj-y += get_bus_conf.o obj-$(CONFIG_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index f5c816fb1a..02742411d0 100644 --- a/src/mainboard/msi/ms9185/Kconfig +++ b/src/mainboard/msi/ms9185/Kconfig @@ -7,6 +7,7 @@ config BOARD_MSI_MS9185 select SOUTHBRIDGE_BROADCOM_BCM5780 select SOUTHBRIDGE_BROADCOM_BCM5785 select SUPERIO_NSC_PC87417 + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/msi/ms9185/Makefile.inc b/src/mainboard/msi/ms9185/Makefile.inc deleted file mode 100644 index 0ecef1d627..0000000000 --- a/src/mainboard/msi/ms9185/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc - -obj-y += get_bus_conf.o diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig index 85f76ec7e0..bf90edfe28 100644 --- a/src/mainboard/msi/ms9282/Kconfig +++ b/src/mainboard/msi/ms9282/Kconfig @@ -6,6 +6,7 @@ config BOARD_MSI_MS9282 select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627EHG + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc index b8eab48927..f1bdc81ba9 100644 --- a/src/mainboard/msi/ms9282/Makefile.inc +++ b/src/mainboard/msi/ms9282/Makefile.inc @@ -21,6 +21,5 @@ obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o obj-y += ../../../drivers/i2c/adm1027/adm1027.o #needed by irq_tables and mptable and acpi_tables -obj-y += get_bus_conf.o obj-$(CONFIG_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o -- cgit v1.2.3