summaryrefslogtreecommitdiff
path: root/src/mainboard/supermicro/x6dai_g
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-02-27 08:39:04 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-02-27 08:39:04 +0000
commit37bdb87fab34f772d17c694d3969fd177c4adf57 (patch)
tree5c6c484a3eb3e9aaecdb4b38587801e902189886 /src/mainboard/supermicro/x6dai_g
parent138be8315b63b0c8955159580d085e7621882b95 (diff)
downloadcoreboot-37bdb87fab34f772d17c694d3969fd177c4adf57.tar.xz
- 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 <patrick.georgi@coresystems.de> Acked-by: Myles Watson <mylesgw@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5168 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/supermicro/x6dai_g')
-rw-r--r--src/mainboard/supermicro/x6dai_g/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dai_g/Makefile.inc3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig
index d79ca567f5..908e8974bf 100644
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -6,6 +6,8 @@ config BOARD_SUPERMICRO_X6DAI_G
select SOUTHBRIDGE_INTEL_ESB6300
select SUPERIO_WINBOND_W83627HF
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/supermicro/x6dai_g/Makefile.inc b/src/mainboard/supermicro/x6dai_g/Makefile.inc
index 455da185cf..495602d94b 100644
--- a/src/mainboard/supermicro/x6dai_g/Makefile.inc
+++ b/src/mainboard/supermicro/x6dai_g/Makefile.inc
@@ -19,6 +19,3 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
-