From 9ea7bff22ecaba50eefd817dd74d092120682f1a Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 28 Feb 2010 18:23:00 +0000 Subject: [PATCH] - 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 --- Makefile | 4 +-- src/Kconfig | 15 ++++++++ src/arch/i386/Makefile.inc | 11 ++++++ src/mainboard/Makefile.k8_CAR.inc | 32 ----------------- src/mainboard/Makefile.k8_ck804.inc | 35 ------------------- src/mainboard/amd/dbm690t/Kconfig | 2 ++ src/mainboard/amd/dbm690t/Makefile.inc | 24 ------------- src/mainboard/amd/pistachio/Kconfig | 2 ++ src/mainboard/amd/pistachio/Makefile.inc | 24 ------------- src/mainboard/amd/serengeti_cheetah/Kconfig | 2 ++ .../amd/serengeti_cheetah/Makefile.inc | 4 --- .../amd/serengeti_cheetah_fam10/Kconfig | 2 ++ .../amd/serengeti_cheetah_fam10/Makefile.inc | 4 --- src/mainboard/arima/hdama/Makefile.inc | 1 - src/mainboard/asus/a8n_e/Kconfig | 1 + src/mainboard/asus/a8n_e/Makefile.inc | 21 ----------- src/mainboard/asus/a8v-e_se/Makefile.inc | 3 -- src/mainboard/asus/m2v-mx_se/Makefile.inc | 23 ------------ src/mainboard/bcom/winnetp680/Makefile.inc | 24 ------------- src/mainboard/broadcom/blast/Kconfig | 1 + src/mainboard/broadcom/blast/Makefile.inc | 2 -- src/mainboard/gigabyte/ga_2761gxdk/Kconfig | 1 + .../gigabyte/ga_2761gxdk/Makefile.inc | 1 - src/mainboard/gigabyte/m57sli/Kconfig | 1 + src/mainboard/gigabyte/m57sli/Makefile.inc | 3 -- src/mainboard/hp/dl145_g3/Kconfig | 1 + src/mainboard/hp/dl145_g3/Makefile.inc | 4 --- src/mainboard/ibm/e325/Makefile.inc | 1 - src/mainboard/ibm/e326/Makefile.inc | 1 - 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 +++++++++ src/mainboard/iwill/dk8_htx/Kconfig | 2 ++ src/mainboard/iwill/dk8_htx/Makefile.inc | 4 --- src/mainboard/iwill/dk8s2/Makefile.inc | 1 - src/mainboard/iwill/dk8x/Makefile.inc | 1 - src/mainboard/kontron/986lcd-m/Kconfig | 1 + src/mainboard/kontron/986lcd-m/Makefile.inc | 3 -- src/mainboard/kontron/kt690/Kconfig | 2 ++ src/mainboard/kontron/kt690/Makefile.inc | 24 ------------- 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 - src/mainboard/newisys/khepri/Makefile.inc | 1 - src/mainboard/nvidia/l1_2pvv/Kconfig | 1 + src/mainboard/nvidia/l1_2pvv/Makefile.inc | 1 - src/mainboard/roda/rk886ex/Kconfig | 1 + src/mainboard/roda/rk886ex/Makefile.inc | 3 -- src/mainboard/sunw/ultra40/Kconfig | 1 + src/mainboard/sunw/ultra40/Makefile.inc | 3 -- src/mainboard/supermicro/h8dme/Kconfig | 1 + src/mainboard/supermicro/h8dme/Makefile.inc | 1 - src/mainboard/supermicro/h8dmr/Kconfig | 1 + src/mainboard/supermicro/h8dmr/Makefile.inc | 21 ----------- src/mainboard/supermicro/h8dmr_fam10/Kconfig | 1 + .../supermicro/h8dmr_fam10/Makefile.inc | 21 ----------- src/mainboard/supermicro/h8qme_fam10/Kconfig | 1 + .../supermicro/h8qme_fam10/Makefile.inc | 21 ----------- src/mainboard/technexion/tim5690/Kconfig | 2 ++ src/mainboard/technexion/tim5690/Makefile.inc | 4 --- src/mainboard/technexion/tim8690/Kconfig | 2 ++ src/mainboard/technexion/tim8690/Makefile.inc | 24 ------------- src/mainboard/tyan/s2850/Makefile.inc | 1 - src/mainboard/tyan/s2875/Makefile.inc | 1 - src/mainboard/tyan/s2880/Makefile.inc | 1 - src/mainboard/tyan/s2881/Kconfig | 1 + src/mainboard/tyan/s2881/Makefile.inc | 2 -- src/mainboard/tyan/s2882/Makefile.inc | 1 - src/mainboard/tyan/s2885/Kconfig | 1 + src/mainboard/tyan/s2885/Makefile.inc | 2 -- src/mainboard/tyan/s2891/Kconfig | 1 + src/mainboard/tyan/s2891/Makefile.inc | 1 - src/mainboard/tyan/s2892/Kconfig | 1 + src/mainboard/tyan/s2892/Makefile.inc | 1 - src/mainboard/tyan/s2895/Kconfig | 1 + src/mainboard/tyan/s2895/Makefile.inc | 1 - src/mainboard/tyan/s2912/Kconfig | 1 + src/mainboard/tyan/s2912/Makefile.inc | 1 - src/mainboard/tyan/s2912_fam10/Kconfig | 1 + src/mainboard/tyan/s2912_fam10/Makefile.inc | 1 - src/mainboard/tyan/s4880/Makefile.inc | 1 - src/mainboard/tyan/s4882/Makefile.inc | 1 - src/mainboard/via/epia-m/Kconfig | 1 + src/mainboard/via/epia-m/Makefile.inc | 3 -- src/mainboard/via/epia-m700/Kconfig | 1 + src/mainboard/via/epia-m700/Makefile.inc | 3 -- src/mainboard/via/epia-n/Kconfig | 1 + src/mainboard/via/epia-n/Makefile.inc | 23 ------------ src/mainboard/via/vt8454c/Kconfig | 1 + src/mainboard/via/vt8454c/Makefile.inc | 22 ------------ 98 files changed, 90 insertions(+), 421 deletions(-) delete mode 100644 src/mainboard/Makefile.k8_CAR.inc delete mode 100644 src/mainboard/Makefile.k8_ck804.inc delete mode 100644 src/mainboard/amd/dbm690t/Makefile.inc delete mode 100644 src/mainboard/amd/pistachio/Makefile.inc delete mode 100644 src/mainboard/arima/hdama/Makefile.inc delete mode 100644 src/mainboard/asus/a8n_e/Makefile.inc delete mode 100644 src/mainboard/asus/a8v-e_se/Makefile.inc delete mode 100644 src/mainboard/asus/m2v-mx_se/Makefile.inc delete mode 100644 src/mainboard/bcom/winnetp680/Makefile.inc delete mode 100644 src/mainboard/hp/dl145_g3/Makefile.inc delete mode 100644 src/mainboard/ibm/e325/Makefile.inc delete mode 100644 src/mainboard/ibm/e326/Makefile.inc delete mode 100644 src/mainboard/intel/eagleheights/Makefile.inc create mode 100644 src/mainboard/intel/xe7501devkit/dsdt.asl delete mode 100644 src/mainboard/iwill/dk8s2/Makefile.inc delete mode 100644 src/mainboard/iwill/dk8x/Makefile.inc delete mode 100644 src/mainboard/kontron/kt690/Makefile.inc delete mode 100644 src/mainboard/msi/ms7135/Makefile.inc delete mode 100644 src/mainboard/msi/ms9185/Makefile.inc delete mode 100644 src/mainboard/newisys/khepri/Makefile.inc delete mode 100644 src/mainboard/sunw/ultra40/Makefile.inc delete mode 100644 src/mainboard/supermicro/h8dmr/Makefile.inc delete mode 100644 src/mainboard/supermicro/h8dmr_fam10/Makefile.inc delete mode 100644 src/mainboard/supermicro/h8qme_fam10/Makefile.inc delete mode 100644 src/mainboard/technexion/tim8690/Makefile.inc delete mode 100644 src/mainboard/tyan/s2850/Makefile.inc delete mode 100644 src/mainboard/tyan/s2875/Makefile.inc delete mode 100644 src/mainboard/tyan/s2880/Makefile.inc delete mode 100644 src/mainboard/tyan/s2882/Makefile.inc delete mode 100644 src/mainboard/tyan/s2885/Makefile.inc delete mode 100644 src/mainboard/tyan/s2891/Makefile.inc delete mode 100644 src/mainboard/tyan/s2895/Makefile.inc delete mode 100644 src/mainboard/tyan/s4880/Makefile.inc delete mode 100644 src/mainboard/tyan/s4882/Makefile.inc delete mode 100644 src/mainboard/via/epia-n/Makefile.inc delete mode 100644 src/mainboard/via/vt8454c/Makefile.inc diff --git a/Makefile b/Makefile index 4cc19e6381..423e1340ea 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ subdirs:=$(PLATFORM-y) $(BUILD-y) $(eval $(call evaluate_subdirs)) -define objs_dsl_template +define objs_asl_template $(obj)/$(1)%.o: src/$(1)%.asl @printf " IASL $$(subst $(top)/,,$$(@))\n" $(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl @@ -201,7 +201,7 @@ endef usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d))))) usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d))))) -$(eval $(call usetemplate,objs,dsl)) +$(eval $(call usetemplate,objs,asl)) $(eval $(call usetemplate,objs,c)) $(eval $(call usetemplate,objs,S)) $(eval $(call usetemplate,initobjs,c)) diff --git a/src/Kconfig b/src/Kconfig index 4cd8110377..dfb2d71a4c 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -186,6 +186,21 @@ config BOARD_HAS_HARD_RESET This variable specifies whether a given board has a reset.c file containing a hard_reset() function. +config BOARD_HAS_FADT + bool + default n + help + This variable specifies whether a given board has a board-local + FADT in fadt.c. Long-term, those should be moved to appropriate + chipset components (eg. southbridge) + +config HAVE_BUS_CONFIG + bool + default n + help + This variable specifies whether a given board has a get_bus_conf.c + file containing bus configuration data. + config HAVE_INIT_TIMER bool default n if UDELAY_IO diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index cd62bf100e..5e6e194a9e 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -213,6 +213,17 @@ endif ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y) objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o endif +ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y) +objs += $(obj)/mainboard/$(MAINBOARDDIR)/acpi_tables.o +objs += $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o +ifeq ($(CONFIG_BOARD_HAS_FADT),y) +objs += $(obj)/mainboard/$(MAINBOARDDIR)/fadt.o +endif +endif + +ifeq ($(CONFIG_HAVE_BUS_CONFIG),y) +objs += $(obj)/mainboard/$(MAINBOARDDIR)/get_bus_conf.o +endif endif diff --git a/src/mainboard/Makefile.k8_CAR.inc b/src/mainboard/Makefile.k8_CAR.inc deleted file mode 100644 index 7d8a0016ee..0000000000 --- a/src/mainboard/Makefile.k8_CAR.inc +++ /dev/null @@ -1,32 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2010 coresystems GmbH -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License as -## published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -## MA 02110-1301 USA -## - -## -## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. -## - - -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o - - - - diff --git a/src/mainboard/Makefile.k8_ck804.inc b/src/mainboard/Makefile.k8_ck804.inc deleted file mode 100644 index b9e1dcfe8e..0000000000 --- a/src/mainboard/Makefile.k8_ck804.inc +++ /dev/null @@ -1,35 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2010 coresystems GmbH -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License as -## published by the Free Software Foundation; version 2 of -## the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -## MA 02110-1301 USA -## - -## -## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. -## - - -#needed by irq_tables and mptable and acpi_tables -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o - - - - - diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index 67019a6195..ce9d08c5ee 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -7,10 +7,12 @@ config BOARD_AMD_DBM690T select SOUTHBRIDGE_AMD_RS690 select SOUTHBRIDGE_AMD_SB600 select SUPERIO_ITE_IT8712F + select BOARD_HAS_FADT select GENERATE_ACPI_TABLES select GENERATE_MP_TABLE select GENERATE_PIRQ_TABLE select HAVE_MAINBOARD_RESOURCES + select HAVE_BUS_CONFIG 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 deleted file mode 100644 index 1a5d69b39f..0000000000 --- a/src/mainboard/amd/dbm690t/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig index 73ae5d6300..d41b7a8dc5 100644 --- a/src/mainboard/amd/pistachio/Kconfig +++ b/src/mainboard/amd/pistachio/Kconfig @@ -6,6 +6,8 @@ config BOARD_AMD_PISTACHIO select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_AMD_RS690 select SOUTHBRIDGE_AMD_SB600 + select BOARD_HAS_FADT + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/amd/pistachio/Makefile.inc b/src/mainboard/amd/pistachio/Makefile.inc deleted file mode 100644 index 1a5d69b39f..0000000000 --- a/src/mainboard/amd/pistachio/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index 1163d75fbc..ca00ba80ba 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -7,6 +7,8 @@ config BOARD_AMD_SERENGETI_CHEETAH select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select BOARD_HAS_FADT + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index f7dabdc428..f2b4800966 100644 --- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc @@ -18,12 +18,8 @@ ## # Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.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) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index 282eca9467..075ef91fd3 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -7,6 +7,8 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10 select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8132 select SUPERIO_WINBOND_W83627HF + select BOARD_HAS_FADT + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc index b3655ed3b6..a0339ee84b 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc @@ -18,10 +18,6 @@ ## # Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.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_GENERATE_ACPI_TABLES) += ssdt2.o diff --git a/src/mainboard/arima/hdama/Makefile.inc b/src/mainboard/arima/hdama/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/arima/hdama/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig index ee66b0ac34..5431287dfc 100644 --- a/src/mainboard/asus/a8n_e/Kconfig +++ b/src/mainboard/asus/a8n_e/Kconfig @@ -6,6 +6,7 @@ config BOARD_ASUS_A8N_E select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_CK804 select SUPERIO_ITE_IT8712F + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/asus/a8n_e/Makefile.inc b/src/mainboard/asus/a8n_e/Makefile.inc deleted file mode 100644 index 5b1a13c211..0000000000 --- a/src/mainboard/asus/a8n_e/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o diff --git a/src/mainboard/asus/a8v-e_se/Makefile.inc b/src/mainboard/asus/a8v-e_se/Makefile.inc deleted file mode 100644 index ceff472b03..0000000000 --- a/src/mainboard/asus/a8v-e_se/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc deleted file mode 100644 index bd6760a8bf..0000000000 --- a/src/mainboard/asus/m2v-mx_se/Makefile.inc +++ /dev/null @@ -1,23 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## Copyright (C) 2009 Cristi Măgherușan -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -#needed by irq_tables and mptable and acpi_tables -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/bcom/winnetp680/Makefile.inc b/src/mainboard/bcom/winnetp680/Makefile.inc deleted file mode 100644 index 757bf4bfc1..0000000000 --- a/src/mainboard/bcom/winnetp680/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2008 VIA Technologies, Inc. -## (Written by Aaron Lwe for VIA) -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig index 92b25914a7..f305e185a8 100644 --- a/src/mainboard/broadcom/blast/Kconfig +++ b/src/mainboard/broadcom/blast/Kconfig @@ -7,6 +7,7 @@ config BOARD_BROADCOM_BLAST 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/broadcom/blast/Makefile.inc b/src/mainboard/broadcom/blast/Makefile.inc index 93efa1ec7c..76c3bf16d8 100644 --- a/src/mainboard/broadcom/blast/Makefile.inc +++ b/src/mainboard/broadcom/blast/Makefile.inc @@ -1,6 +1,4 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc # Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig index cd53f49247..d599c5cd1d 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig +++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig @@ -6,6 +6,7 @@ config BOARD_GIGABYTE_GA_2761GXDK select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_SIS_SIS966 select SUPERIO_ITE_IT8716F + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc b/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc index 271e9fe547..9c0156e9dd 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc +++ b/src/mainboard/gigabyte/ga_2761gxdk/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/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig index ff18dd40d4..fabef71ea1 100644 --- a/src/mainboard/gigabyte/m57sli/Kconfig +++ b/src/mainboard/gigabyte/m57sli/Kconfig @@ -7,6 +7,7 @@ config BOARD_GIGABYTE_M57SLI select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_ITE_IT8716F select SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc index a824f44494..9c55ac5a81 100644 --- a/src/mainboard/gigabyte/m57sli/Makefile.inc +++ b/src/mainboard/gigabyte/m57sli/Makefile.inc @@ -18,9 +18,6 @@ ## #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 -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig index 13ef1af3b4..bea50d75cb 100644 --- a/src/mainboard/hp/dl145_g3/Kconfig +++ b/src/mainboard/hp/dl145_g3/Kconfig @@ -7,6 +7,7 @@ config BOARD_HP_DL145_G3 select SOUTHBRIDGE_BROADCOM_BCM21000 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/hp/dl145_g3/Makefile.inc b/src/mainboard/hp/dl145_g3/Makefile.inc deleted file mode 100644 index d113e50d00..0000000000 --- a/src/mainboard/hp/dl145_g3/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o diff --git a/src/mainboard/ibm/e325/Makefile.inc b/src/mainboard/ibm/e325/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/ibm/e325/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/ibm/e326/Makefile.inc b/src/mainboard/ibm/e326/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/ibm/e326/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc 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 +) +{ +} diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig index 538e0fe92d..5250e4d46f 100644 --- a/src/mainboard/iwill/dk8_htx/Kconfig +++ b/src/mainboard/iwill/dk8_htx/Kconfig @@ -7,6 +7,8 @@ config BOARD_IWILL_DK8_HTX select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select BOARD_HAS_FADT + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc index ec879c6bb5..2537702240 100644 --- a/src/mainboard/iwill/dk8_htx/Makefile.inc +++ b/src/mainboard/iwill/dk8_htx/Makefile.inc @@ -18,11 +18,7 @@ ## # Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.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 -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o diff --git a/src/mainboard/iwill/dk8s2/Makefile.inc b/src/mainboard/iwill/dk8s2/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/iwill/dk8s2/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/iwill/dk8x/Makefile.inc b/src/mainboard/iwill/dk8x/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/iwill/dk8x/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index 6ff5c556dd..765d7b815a 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -6,6 +6,7 @@ config BOARD_KONTRON_986LCD_M select NORTHBRIDGE_INTEL_I945 select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_WINBOND_W83627THG + select BOARD_HAS_FADT select GENERATE_ACPI_TABLES select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc index 5bd9a895b9..b6c9383f30 100644 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ b/src/mainboard/kontron/986lcd-m/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/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig index c43cca43ba..0a695dfdac 100644 --- a/src/mainboard/kontron/kt690/Kconfig +++ b/src/mainboard/kontron/kt690/Kconfig @@ -7,6 +7,8 @@ config BOARD_KONTRON_KT690 select SOUTHBRIDGE_AMD_RS690 select SOUTHBRIDGE_AMD_SB600 select SUPERIO_WINBOND_W83627DHG + select BOARD_HAS_FADT + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select HAVE_MAINBOARD_RESOURCES diff --git a/src/mainboard/kontron/kt690/Makefile.inc b/src/mainboard/kontron/kt690/Makefile.inc deleted file mode 100644 index 1a5d69b39f..0000000000 --- a/src/mainboard/kontron/kt690/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o 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 diff --git a/src/mainboard/newisys/khepri/Makefile.inc b/src/mainboard/newisys/khepri/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/newisys/khepri/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig index a6bc14b241..91654d17af 100644 --- a/src/mainboard/nvidia/l1_2pvv/Kconfig +++ b/src/mainboard/nvidia/l1_2pvv/Kconfig @@ -6,6 +6,7 @@ config BOARD_NVIDIA_L1_2PVV 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/nvidia/l1_2pvv/Makefile.inc b/src/mainboard/nvidia/l1_2pvv/Makefile.inc index 271e9fe547..9c0156e9dd 100644 --- a/src/mainboard/nvidia/l1_2pvv/Makefile.inc +++ b/src/mainboard/nvidia/l1_2pvv/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/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig index 1b1aca0fba..02aa0c5c73 100644 --- a/src/mainboard/roda/rk886ex/Kconfig +++ b/src/mainboard/roda/rk886ex/Kconfig @@ -8,6 +8,7 @@ config BOARD_RODA_RK886EX select SOUTHBRIDGE_TI_PCI7420 select SUPERIO_SMSC_LPC47N227 select SUPERIO_RENESAS_M3885X + select BOARD_HAS_FADT select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select MMCONF_SUPPORT diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc index 7da49f700a..fbf51bc990 100644 --- a/src/mainboard/roda/rk886ex/Makefile.inc +++ b/src/mainboard/roda/rk886ex/Makefile.inc @@ -25,8 +25,5 @@ obj-y += m3885.o obj-y += ec.o 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/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index 71aa3bdb0e..49b292a448 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -6,6 +6,7 @@ config BOARD_SUNW_ULTRA40 select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_CK804 select SUPERIO_SMSC_LPC47M10X + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/sunw/ultra40/Makefile.inc b/src/mainboard/sunw/ultra40/Makefile.inc deleted file mode 100644 index 0ecef1d627..0000000000 --- a/src/mainboard/sunw/ultra40/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/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig index 10e97a1384..d297069e67 100644 --- a/src/mainboard/supermicro/h8dme/Kconfig +++ b/src/mainboard/supermicro/h8dme/Kconfig @@ -6,6 +6,7 @@ config BOARD_SUPERMICRO_H8DME select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc index 15fca9e73c..132161309d 100644 --- a/src/mainboard/supermicro/h8dme/Makefile.inc +++ b/src/mainboard/supermicro/h8dme/Makefile.inc @@ -20,4 +20,3 @@ obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o # Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig index 77109555a2..9fad7a34e0 100644 --- a/src/mainboard/supermicro/h8dmr/Kconfig +++ b/src/mainboard/supermicro/h8dmr/Kconfig @@ -6,6 +6,7 @@ config BOARD_SUPERMICRO_H8DMR select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/supermicro/h8dmr/Makefile.inc b/src/mainboard/supermicro/h8dmr/Makefile.inc deleted file mode 100644 index 5b1a13c211..0000000000 --- a/src/mainboard/supermicro/h8dmr/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig index 1c1dc9325e..a325b70728 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig +++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig @@ -6,6 +6,7 @@ config BOARD_SUPERMICRO_H8DMR_FAM10 select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc b/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc deleted file mode 100644 index 5b1a13c211..0000000000 --- a/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig index 13eff4dd80..12622f475b 100644 --- a/src/mainboard/supermicro/h8qme_fam10/Kconfig +++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig @@ -7,6 +7,7 @@ config BOARD_SUPERMICRO_H8QME_FAM10 select SOUTHBRIDGE_AMD_AMD8132 select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc b/src/mainboard/supermicro/h8qme_fam10/Makefile.inc deleted file mode 100644 index 5b1a13c211..0000000000 --- a/src/mainboard/supermicro/h8qme_fam10/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig index fc9ccb7305..b2b4362874 100644 --- a/src/mainboard/technexion/tim5690/Kconfig +++ b/src/mainboard/technexion/tim5690/Kconfig @@ -7,6 +7,8 @@ config BOARD_TECHNEXION_TIM5690 select SOUTHBRIDGE_AMD_RS690 select SOUTHBRIDGE_AMD_SB600 select SUPERIO_ITE_IT8712F + select BOARD_HAS_FADT + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc index c72c5ee269..cc78a0000b 100644 --- a/src/mainboard/technexion/tim5690/Makefile.inc +++ b/src/mainboard/technexion/tim5690/Makefile.inc @@ -18,10 +18,6 @@ ## # Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.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 debug message for products of Technexion. obj-y += tn_post_code.o diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig index 43be15cef7..f0292fc651 100644 --- a/src/mainboard/technexion/tim8690/Kconfig +++ b/src/mainboard/technexion/tim8690/Kconfig @@ -7,6 +7,8 @@ config BOARD_TECHNEXION_TIM8690 select SOUTHBRIDGE_AMD_RS690 select SOUTHBRIDGE_AMD_SB600 select SUPERIO_ITE_IT8712F + select BOARD_HAS_FADT + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/technexion/tim8690/Makefile.inc b/src/mainboard/technexion/tim8690/Makefile.inc deleted file mode 100644 index 1a5d69b39f..0000000000 --- a/src/mainboard/technexion/tim8690/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# Needed by irq_tables and mptable and acpi_tables. -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o diff --git a/src/mainboard/tyan/s2850/Makefile.inc b/src/mainboard/tyan/s2850/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/tyan/s2850/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/tyan/s2875/Makefile.inc b/src/mainboard/tyan/s2875/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/tyan/s2875/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/tyan/s2880/Makefile.inc b/src/mainboard/tyan/s2880/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/tyan/s2880/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig index 017c6227f6..d719f0f1de 100644 --- a/src/mainboard/tyan/s2881/Kconfig +++ b/src/mainboard/tyan/s2881/Kconfig @@ -7,6 +7,7 @@ config BOARD_TYAN_S2881 select SOUTHBRIDGE_AMD_AMD8131 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/tyan/s2881/Makefile.inc b/src/mainboard/tyan/s2881/Makefile.inc index aa0510402f..4160fecd12 100644 --- a/src/mainboard/tyan/s2881/Makefile.inc +++ b/src/mainboard/tyan/s2881/Makefile.inc @@ -1,3 +1 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc -obj-y += get_bus_conf.o obj-y += ../../../drivers/i2c/adm1027/adm1027.o diff --git a/src/mainboard/tyan/s2882/Makefile.inc b/src/mainboard/tyan/s2882/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/tyan/s2882/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig index bd66b609b0..216c29dcda 100644 --- a/src/mainboard/tyan/s2885/Kconfig +++ b/src/mainboard/tyan/s2885/Kconfig @@ -7,6 +7,7 @@ config BOARD_TYAN_S2885 select SOUTHBRIDGE_AMD_AMD8131 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/tyan/s2885/Makefile.inc b/src/mainboard/tyan/s2885/Makefile.inc deleted file mode 100644 index c9f716360b..0000000000 --- a/src/mainboard/tyan/s2885/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc -obj-y += get_bus_conf.o diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig index 028934b508..7c600abafa 100644 --- a/src/mainboard/tyan/s2891/Kconfig +++ b/src/mainboard/tyan/s2891/Kconfig @@ -7,6 +7,7 @@ config BOARD_TYAN_S2891 select SOUTHBRIDGE_NVIDIA_CK804 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/tyan/s2891/Makefile.inc b/src/mainboard/tyan/s2891/Makefile.inc deleted file mode 100644 index 53cb4fcdcf..0000000000 --- a/src/mainboard/tyan/s2891/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_ck804.inc diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig index 39a5cb9c54..a21665ee8a 100644 --- a/src/mainboard/tyan/s2892/Kconfig +++ b/src/mainboard/tyan/s2892/Kconfig @@ -7,6 +7,7 @@ config BOARD_TYAN_S2892 select SOUTHBRIDGE_NVIDIA_CK804 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/tyan/s2892/Makefile.inc b/src/mainboard/tyan/s2892/Makefile.inc index c78f133554..3094c13658 100644 --- a/src/mainboard/tyan/s2892/Makefile.inc +++ b/src/mainboard/tyan/s2892/Makefile.inc @@ -1,3 +1,2 @@ -include $(src)/mainboard/Makefile.k8_ck804.inc obj-y += ../../../drivers/i2c/adm1027/adm1027.o diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig index c411e9b575..0be63a72aa 100644 --- a/src/mainboard/tyan/s2895/Kconfig +++ b/src/mainboard/tyan/s2895/Kconfig @@ -7,6 +7,7 @@ config BOARD_TYAN_S2895 select SOUTHBRIDGE_NVIDIA_CK804 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_SMSC_LPC47B397 + select HAVE_BUS_CONFIG select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE diff --git a/src/mainboard/tyan/s2895/Makefile.inc b/src/mainboard/tyan/s2895/Makefile.inc deleted file mode 100644 index 53cb4fcdcf..0000000000 --- a/src/mainboard/tyan/s2895/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_ck804.inc diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig index 4a541d7a6a..83cf5e59dd 100644 --- a/src/mainboard/tyan/s2912/Kconfig +++ b/src/mainboard/tyan/s2912/Kconfig @@ -6,6 +6,7 @@ config BOARD_TYAN_S2912 select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/tyan/s2912/Makefile.inc b/src/mainboard/tyan/s2912/Makefile.inc index 271e9fe547..9c0156e9dd 100644 --- a/src/mainboard/tyan/s2912/Makefile.inc +++ b/src/mainboard/tyan/s2912/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/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig index 40ec9b4151..23e18ba4d2 100644 --- a/src/mainboard/tyan/s2912_fam10/Kconfig +++ b/src/mainboard/tyan/s2912_fam10/Kconfig @@ -6,6 +6,7 @@ config BOARD_TYAN_S2912_FAM10 select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/tyan/s2912_fam10/Makefile.inc b/src/mainboard/tyan/s2912_fam10/Makefile.inc index 271e9fe547..9c0156e9dd 100644 --- a/src/mainboard/tyan/s2912_fam10/Makefile.inc +++ b/src/mainboard/tyan/s2912_fam10/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/tyan/s4880/Makefile.inc b/src/mainboard/tyan/s4880/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/tyan/s4880/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/tyan/s4882/Makefile.inc b/src/mainboard/tyan/s4882/Makefile.inc deleted file mode 100644 index b1077f9940..0000000000 --- a/src/mainboard/tyan/s4882/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.k8_CAR.inc diff --git a/src/mainboard/via/epia-m/Kconfig b/src/mainboard/via/epia-m/Kconfig index 2e656e467d..5674c7bf7d 100644 --- a/src/mainboard/via/epia-m/Kconfig +++ b/src/mainboard/via/epia-m/Kconfig @@ -6,6 +6,7 @@ config BOARD_VIA_EPIA_M select SOUTHBRIDGE_VIA_VT8235 select SOUTHBRIDGE_RICOH_RL5C476 select SUPERIO_VIA_VT1211 + select BOARD_HAS_FADT select HAVE_PIRQ_TABLE select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc index 490ba505c4..cabc789423 100644 --- a/src/mainboard/via/epia-m/Makefile.inc +++ b/src/mainboard/via/epia-m/Makefile.inc @@ -21,6 +21,3 @@ obj-y += vgabios.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig index f711987ba0..d5547ea602 100644 --- a/src/mainboard/via/epia-m700/Kconfig +++ b/src/mainboard/via/epia-m700/Kconfig @@ -4,6 +4,7 @@ config BOARD_VIA_EPIA_M700 select CPU_VIA_C7 select NORTHBRIDGE_VIA_VX800 select SUPERIO_WINBOND_W83697HF + select BOARD_HAS_FADT select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc index 462c1dcbe5..da2b05f02f 100644 --- a/src/mainboard/via/epia-m700/Makefile.inc +++ b/src/mainboard/via/epia-m700/Makefile.inc @@ -21,6 +21,3 @@ obj-y += wakeup.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig index 229655a149..5d6c1ec72d 100644 --- a/src/mainboard/via/epia-n/Kconfig +++ b/src/mainboard/via/epia-n/Kconfig @@ -5,6 +5,7 @@ config BOARD_VIA_EPIA_N select NORTHBRIDGE_VIA_CN400 select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_WINBOND_W83697HF + select BOARD_HAS_FADT select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select EPIA_VT8237R_INIT diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc deleted file mode 100644 index c8aab2f66d..0000000000 --- a/src/mainboard/via/epia-n/Makefile.inc +++ /dev/null @@ -1,23 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2008 VIA Technologies, Inc. -## (Written by Aaron Lwe for VIA) -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index 74c3fe1e36..eec8195fb1 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -4,6 +4,7 @@ config BOARD_VIA_VT8454C select CPU_VIA_C7 select NORTHBRIDGE_VIA_CX700 select SUPERIO_VIA_VT1211 + select BOARD_HAS_FADT select HAVE_PIRQ_TABLE select HAVE_MP_TABLE # select MMCONF_SUPPORT diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc deleted file mode 100644 index 23410507c0..0000000000 --- a/src/mainboard/via/vt8454c/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2009 coresystems GmbH -## -## This program is free software; you can redistribute it and/or -## modify it under the terms of the GNU General Public License as -## published by the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o