From 4dfdebadb6731bc291e30560cbd2f107a3c94b75 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 13 Nov 2012 14:06:38 -0800 Subject: [PATCH] Reduce number of per-mainboard changes - Add mainboard_smi.c from arch/x86/Makefile if it's there - Add mainboard's chromeos.c from the chromeos Makefile Change-Id: I3f80e2cb368f88d2a38036895a19f3576dd9553b Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/1835 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/arch/x86/Makefile.inc | 6 ++++- src/mainboard/getac/p470/Makefile.inc | 2 -- src/mainboard/ibase/mb899/Makefile.inc | 2 -- src/mainboard/intel/d945gclf/Makefile.inc | 20 ---------------- src/mainboard/intel/emeraldlake2/Makefile.inc | 23 ------------------ src/mainboard/iwave/iWRainbowG6/Makefile.inc | 21 ---------------- src/mainboard/kontron/986lcd-m/Makefile.inc | 20 ---------------- src/mainboard/lenovo/t60/Makefile.inc | 2 +- src/mainboard/lenovo/x60/Makefile.inc | 2 +- src/mainboard/rca/rm4100/Makefile.inc | 2 -- src/mainboard/roda/rk886ex/Makefile.inc | 1 - src/mainboard/samsung/lumpy/Makefile.inc | 4 ---- src/mainboard/samsung/stumpy/Makefile.inc | 24 ------------------- src/mainboard/thomson/ip1000/Makefile.inc | 2 -- src/vendorcode/google/chromeos/Makefile.inc | 4 ++++ 15 files changed, 11 insertions(+), 124 deletions(-) delete mode 100644 src/mainboard/intel/d945gclf/Makefile.inc delete mode 100644 src/mainboard/intel/emeraldlake2/Makefile.inc delete mode 100644 src/mainboard/iwave/iWRainbowG6/Makefile.inc delete mode 100644 src/mainboard/kontron/986lcd-m/Makefile.inc delete mode 100644 src/mainboard/rca/rm4100/Makefile.inc delete mode 100644 src/mainboard/samsung/stumpy/Makefile.inc delete mode 100644 src/mainboard/thomson/ip1000/Makefile.inc diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index ae123c5d64..44787a3ec6 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -264,7 +264,11 @@ ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c endif endif - +ifeq ($(CONFIG_HAVE_SMI_HANDLER),y) +ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard_smi.c),) +smm-srcs += src/mainboard/$(MAINBOARDDIR)/mainboard_smi.c +endif +endif ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c),) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c endif diff --git a/src/mainboard/getac/p470/Makefile.inc b/src/mainboard/getac/p470/Makefile.inc index f2d0968b12..ebfdd49c60 100644 --- a/src/mainboard/getac/p470/Makefile.inc +++ b/src/mainboard/getac/p470/Makefile.inc @@ -18,5 +18,3 @@ ## ramstage-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.c - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/ibase/mb899/Makefile.inc b/src/mainboard/ibase/mb899/Makefile.inc index 95c8987254..c2c861d604 100644 --- a/src/mainboard/ibase/mb899/Makefile.inc +++ b/src/mainboard/ibase/mb899/Makefile.inc @@ -18,5 +18,3 @@ ## driver-y += mv88e8053.c - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc deleted file mode 100644 index e0dd8ed0f8..0000000000 --- a/src/mainboard/intel/d945gclf/Makefile.inc +++ /dev/null @@ -1,20 +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 -## - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/intel/emeraldlake2/Makefile.inc b/src/mainboard/intel/emeraldlake2/Makefile.inc deleted file mode 100644 index 80385d6892..0000000000 --- a/src/mainboard/intel/emeraldlake2/Makefile.inc +++ /dev/null @@ -1,23 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -## -## 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 -## - -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/iwave/iWRainbowG6/Makefile.inc b/src/mainboard/iwave/iWRainbowG6/Makefile.inc deleted file mode 100644 index e9f851addf..0000000000 --- a/src/mainboard/iwave/iWRainbowG6/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 -## - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c - diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc deleted file mode 100644 index fb78b3d83f..0000000000 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ /dev/null @@ -1,20 +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 -## - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/lenovo/t60/Makefile.inc b/src/mainboard/lenovo/t60/Makefile.inc index 75152586f8..5e09e99fda 100644 --- a/src/mainboard/lenovo/t60/Makefile.inc +++ b/src/mainboard/lenovo/t60/Makefile.inc @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c dock.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c romstage-y += dock.c diff --git a/src/mainboard/lenovo/x60/Makefile.inc b/src/mainboard/lenovo/x60/Makefile.inc index 83cdeb9938..0b01fe45c7 100644 --- a/src/mainboard/lenovo/x60/Makefile.inc +++ b/src/mainboard/lenovo/x60/Makefile.inc @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c dock.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c romstage-y += dock.c ramstage-y += dock.c diff --git a/src/mainboard/rca/rm4100/Makefile.inc b/src/mainboard/rca/rm4100/Makefile.inc deleted file mode 100644 index 3a3371a19c..0000000000 --- a/src/mainboard/rca/rm4100/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c - diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc index 96458f8261..8d309389cf 100644 --- a/src/mainboard/roda/rk886ex/Makefile.inc +++ b/src/mainboard/roda/rk886ex/Makefile.inc @@ -19,4 +19,3 @@ ramstage-y += m3885.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc index f25aaa5854..bd4794220c 100644 --- a/src/mainboard/samsung/lumpy/Makefile.inc +++ b/src/mainboard/samsung/lumpy/Makefile.inc @@ -19,10 +19,6 @@ ramstage-y += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c SPD_BIN = $(obj)/spd.bin # Include spd rom data diff --git a/src/mainboard/samsung/stumpy/Makefile.inc b/src/mainboard/samsung/stumpy/Makefile.inc deleted file mode 100644 index 011df456c5..0000000000 --- a/src/mainboard/samsung/stumpy/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -## -## 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 -## - -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c - diff --git a/src/mainboard/thomson/ip1000/Makefile.inc b/src/mainboard/thomson/ip1000/Makefile.inc deleted file mode 100644 index 3a3371a19c..0000000000 --- a/src/mainboard/thomson/ip1000/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c - diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index b2f3d351f0..967db963c4 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -26,3 +26,7 @@ ramstage-y += gnvs.c romstage-y += fmap.c ramstage-y += fmap.c smm-y += fmap.c +ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/chromeos.c),) +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/chromeos.c +romstage-srcs += src/mainboard/$(MAINBOARDDIR)/chromeos.c +endif