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/d945gclf/Kconfig | 1 + src/mainboard/intel/d945gclf/Makefile.inc | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/mainboard/intel/d945gclf') diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index fefeaf6c52..261989a4a1 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 HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select HAVE_ACPI_TABLES diff --git a/src/mainboard/intel/d945gclf/Makefile.inc b/src/mainboard/intel/d945gclf/Makefile.inc index 95f2f65af7..9516e9ea21 100644 --- a/src/mainboard/intel/d945gclf/Makefile.inc +++ b/src/mainboard/intel/d945gclf/Makefile.inc @@ -21,19 +21,10 @@ ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. ## -obj-y += mainboard.o obj-y += rtl8168.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 smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - -- cgit v1.2.3