- 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

12 files changed, 9 insertions, 30 deletions

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
-
-
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.
-
-
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index fc70befafa..042e1de362 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -7,6 +7,8 @@ config BOARD_INTEL_JARRELL
 	select SOUTHBRIDGE_INTEL_I82801EX
 	select SUPERIO_NSC_PC87427
 	select ROMCC
+	select HAVE_HARD_RESET
+	select BOARD_HAS_HARD_RESET
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select UDELAY_TSC
diff --git a/src/mainboard/intel/jarrell/Makefile.inc b/src/mainboard/intel/jarrell/Makefile.inc
index 80249df044..0f285cdfed 100644
--- a/src/mainboard/intel/jarrell/Makefile.inc
+++ b/src/mainboard/intel/jarrell/Makefile.inc
@@ -1,4 +1 @@
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 ROMCCFLAGS := -mcpu=p4 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index 693914da5b..785c6b4ea2 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -6,6 +6,7 @@ config BOARD_INTEL_MTARVON
 	select SOUTHBRIDGE_INTEL_I3100
 	select SUPERIO_INTEL_I3100
 	select ROMCC
+	select HAVE_HARD_RESET
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select UDELAY_TSC
diff --git a/src/mainboard/intel/mtarvon/Makefile.inc b/src/mainboard/intel/mtarvon/Makefile.inc
index 8e216dd277..0f285cdfed 100644
--- a/src/mainboard/intel/mtarvon/Makefile.inc
+++ b/src/mainboard/intel/mtarvon/Makefile.inc
@@ -1,3 +1 @@
 ROMCCFLAGS := -mcpu=p4 -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index fbc577fffa..22c898326f 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -7,6 +7,7 @@ config BOARD_INTEL_TRUXTON
 	select SUPERIO_INTEL_I3100
 	select SUPERIO_SMSC_SMSCSUPERIO
 	select ROMCC
+	select HAVE_HARD_RESET
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select UDELAY_TSC
diff --git a/src/mainboard/intel/truxton/Makefile.inc b/src/mainboard/intel/truxton/Makefile.inc
index 4a5d4f7bb2..6ef4fc9d50 100644
--- a/src/mainboard/intel/truxton/Makefile.inc
+++ b/src/mainboard/intel/truxton/Makefile.inc
@@ -1,3 +1 @@
 ROMCCFLAGS := -mcpu=p4 -fno-simplify-phi -O2
-include $(src)/mainboard/Makefile.romccboard.inc
-
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index d2a9f4779f..5024013294 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -7,6 +7,8 @@ config BOARD_INTEL_XE7501DEVKIT
 	select SOUTHBRIDGE_INTEL_I82801CX
 	select SUPERIO_SMSC_LPC47B272
 	select ROMCC
+	select HAVE_HARD_RESET
+	select BOARD_HAS_HARD_RESET
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select UDELAY_TSC
diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc
index 0b1acdc242..4878dc3ff9 100644
--- a/src/mainboard/intel/xe7501devkit/Makefile.inc
+++ b/src/mainboard/intel/xe7501devkit/Makefile.inc
@@ -1,5 +1,2 @@
 ROMCCFLAGS := -mcpu=p4 -O2
 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-include $(src)/mainboard/Makefile.romccboard.inc
-