From d1327ce9639645f84024ddd66d2b11f57619d8e6 Mon Sep 17 00:00:00 2001 From: "- supermicro/x6dhe_g/auto.c" <- supermicro/x6dhe_g/auto.c> Date: Sat, 24 Oct 2009 19:17:24 +0000 Subject: Major cleanups of the hard_reset() code and config in coreboot. - Drop unused "#object reset.o" entries. - Use CONFIG_HAVE_HARD_RESET for all "object reset.o" entries. - Drop dead/commented code, i.e. useless hard_reset() from: - supermicro/x6dhe_g/auto.c - supermicro/x6dhe_g2/auto.c - supermicro/x6dhe_g2/auto.updated.c - supermicro/x6dhr_ig/auto.c - supermicro/x6dhr_ig2/auto.c - digitallogic/msm586seg/auto.c - dell/s1850/auto.c - Add "obj-$(CONFIG_HAVE_HARD_RESET) += reset.o" to kconfig files of boards that actually have a reset.c file. Signed-off-by: Uwe Hermann Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4849 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/kontron/986lcd-m/Config.lb | 2 +- src/mainboard/kontron/986lcd-m/Makefile.inc | 1 + src/mainboard/kontron/kt690/Config.lb | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/mainboard/kontron') diff --git a/src/mainboard/kontron/986lcd-m/Config.lb b/src/mainboard/kontron/986lcd-m/Config.lb index 4f9607685a..0dc004055c 100644 --- a/src/mainboard/kontron/986lcd-m/Config.lb +++ b/src/mainboard/kontron/986lcd-m/Config.lb @@ -61,7 +61,7 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end if CONFIG_USE_INIT diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc index b719b5836d..61acbe68ca 100644 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -32,6 +32,7 @@ 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 +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o diff --git a/src/mainboard/kontron/kt690/Config.lb b/src/mainboard/kontron/kt690/Config.lb index 1fb667deb9..f1b4215aa4 100644 --- a/src/mainboard/kontron/kt690/Config.lb +++ b/src/mainboard/kontron/kt690/Config.lb @@ -50,8 +50,6 @@ if CONFIG_GENERATE_ACPI_TABLES object ./dsdt.o end -#object reset.o - if CONFIG_USE_INIT makerule ./cache_as_ram_auto.o -- cgit v1.2.3