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/dell/s1850/Kconfig | 2 ++ src/mainboard/dell/s1850/Makefile.inc | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mainboard/dell/s1850') diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig index aeb14a008a..853e2ab7a5 100644 --- a/src/mainboard/dell/s1850/Kconfig +++ b/src/mainboard/dell/s1850/Kconfig @@ -7,6 +7,8 @@ config BOARD_DELL_S1850 select SOUTHBRIDGE_INTEL_PXHD select SUPERIO_NSC_PC8374 select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc index 8e216dd277..0f285cdfed 100644 --- a/src/mainboard/dell/s1850/Makefile.inc +++ b/src/mainboard/dell/s1850/Makefile.inc @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=p4 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - -- cgit v1.2.3