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/intel/eagleheights/Kconfig | 2 ++ src/mainboard/intel/eagleheights/Makefile.inc | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'src/mainboard/intel/eagleheights') diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig index c336863d66..45b173f1bb 100644 --- a/src/mainboard/intel/eagleheights/Kconfig +++ b/src/mainboard/intel/eagleheights/Kconfig @@ -6,6 +6,8 @@ config BOARD_INTEL_EAGLEHEIGHTS select SOUTHBRIDGE_INTEL_I3100 select SUPERIO_INTEL_I3100 select SUPERIO_SMSC_SMSCSUPERIO + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET 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 index e17be314f0..3eaf840d9c 100644 --- a/src/mainboard/intel/eagleheights/Makefile.inc +++ b/src/mainboard/intel/eagleheights/Makefile.inc @@ -1,14 +1,3 @@ -obj-y += mainboard.o -obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o -# Use Intel Core (not Core 2) code for CAR init, any CPU might be used. - - -- cgit v1.2.3