From 37bdb87fab34f772d17c694d3969fd177c4adf57 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 27 Feb 2010 08:39:04 +0000 Subject: - make HAVE_HARD_RESET match what newconfig did - introduce BOARD_HAS_HARD_RESET and use it if a board provides hard_reset in $(MAINBOARDDIR)/reset.c, instead of some chipset component - move a couple of rules out of the mainboards' Makefiles into src/arch/i386/Makefile.inc: initobj-y += crt0.o obj-y += mainboard.o obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o obj-$(CONFIG_BOARD_HAS_HARD_RESET) += reset.o - remove Makefile.incs that are empty (or comment-only) after these changes, incl. Makefile.romccboard.inc (and references to it) - Make include not fail if Makefile.inc doesn't exist. Signed-off-by: Patrick Georgi Acked-by: Myles Watson Acked-by: Peter Stuge Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5168 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/via/epia-cn/Makefile.inc | 2 -- src/mainboard/via/epia-m/Makefile.inc | 6 ------ src/mainboard/via/epia-m700/Makefile.inc | 7 ------- src/mainboard/via/epia-n/Makefile.inc | 8 -------- src/mainboard/via/epia/Makefile.inc | 27 --------------------------- src/mainboard/via/pc2500e/Makefile.inc | 2 -- src/mainboard/via/vt8454c/Kconfig | 1 + src/mainboard/via/vt8454c/Makefile.inc | 8 -------- 8 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 src/mainboard/via/epia/Makefile.inc (limited to 'src/mainboard/via') diff --git a/src/mainboard/via/epia-cn/Makefile.inc b/src/mainboard/via/epia-cn/Makefile.inc index 572af6f80c..691b3d55e3 100644 --- a/src/mainboard/via/epia-cn/Makefile.inc +++ b/src/mainboard/via/epia-cn/Makefile.inc @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=c3 -O -include $(src)/mainboard/Makefile.romccboard.inc - diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc index 3f02ca68e0..490ba505c4 100644 --- a/src/mainboard/via/epia-m/Makefile.inc +++ b/src/mainboard/via/epia-m/Makefile.inc @@ -19,14 +19,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -initobj-y += crt0.o -obj-y += mainboard.o obj-y += vgabios.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.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/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc index 8bae6614a1..462c1dcbe5 100644 --- a/src/mainboard/via/epia-m700/Makefile.inc +++ b/src/mainboard/via/epia-m700/Makefile.inc @@ -19,15 +19,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -initobj-y += crt0.o -obj-y += mainboard.o obj-y += wakeup.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.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/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc index e8c0510dd2..c8aab2f66d 100644 --- a/src/mainboard/via/epia-n/Makefile.inc +++ b/src/mainboard/via/epia-n/Makefile.inc @@ -19,13 +19,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -initobj-y += crt0.o -obj-y += mainboard.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o - obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o - - - diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc deleted file mode 100644 index aadc736d2e..0000000000 --- a/src/mainboard/via/epia/Makefile.inc +++ /dev/null @@ -1,27 +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 -## - -initobj-y += crt0.o -obj-y += mainboard.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - - - diff --git a/src/mainboard/via/pc2500e/Makefile.inc b/src/mainboard/via/pc2500e/Makefile.inc index c02dce811c..8d32f8797a 100644 --- a/src/mainboard/via/pc2500e/Makefile.inc +++ b/src/mainboard/via/pc2500e/Makefile.inc @@ -19,5 +19,3 @@ ## ROMCCFLAGS ?= -mcpu=c3 -include $(src)/mainboard/Makefile.romccboard.inc - diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index 40a5fd818d..74c3fe1e36 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -8,6 +8,7 @@ config BOARD_VIA_VT8454C select HAVE_MP_TABLE # select MMCONF_SUPPORT select USE_PRINTK_IN_CAR + select HAVE_HARD_RESET select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 select USE_DCACHE_RAM diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc index 578d0e541b..23410507c0 100644 --- a/src/mainboard/via/vt8454c/Makefile.inc +++ b/src/mainboard/via/vt8454c/Makefile.inc @@ -17,14 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += mainboard.o - -obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o - -initobj-y += crt0.o - - -- cgit v1.2.3