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/digitallogic/adl855pc/Config.lb | 1 - src/mainboard/digitallogic/adl855pc/Kconfig | 1 + src/mainboard/digitallogic/adl855pc/auto.c | 1 - src/mainboard/digitallogic/msm586seg/Config.lb | 1 - src/mainboard/digitallogic/msm586seg/auto.c | 4 ---- 5 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src/mainboard/digitallogic') diff --git a/src/mainboard/digitallogic/adl855pc/Config.lb b/src/mainboard/digitallogic/adl855pc/Config.lb index 2a97f08669..c20323109f 100644 --- a/src/mainboard/digitallogic/adl855pc/Config.lb +++ b/src/mainboard/digitallogic/adl855pc/Config.lb @@ -14,7 +14,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#object reset.o ## ## Romcc output diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig index e53f6833bc..ff7092ca01 100644 --- a/src/mainboard/digitallogic/adl855pc/Kconfig +++ b/src/mainboard/digitallogic/adl855pc/Kconfig @@ -8,6 +8,7 @@ config BOARD_DIGITALLOGIC_ADL855PC select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_1024 + select HAVE_HARD_RESET config MAINBOARD_DIR string diff --git a/src/mainboard/digitallogic/adl855pc/auto.c b/src/mainboard/digitallogic/adl855pc/auto.c index ad75c37cce..069aba077a 100644 --- a/src/mainboard/digitallogic/adl855pc/auto.c +++ b/src/mainboard/digitallogic/adl855pc/auto.c @@ -31,7 +31,6 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) - static void hard_reset(void) { outb(0x0e, 0x0cf9); diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb index c50b3b736a..f223884883 100644 --- a/src/mainboard/digitallogic/msm586seg/Config.lb +++ b/src/mainboard/digitallogic/msm586seg/Config.lb @@ -16,7 +16,6 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -# object reset.o ## ## Romcc output diff --git a/src/mainboard/digitallogic/msm586seg/auto.c b/src/mainboard/digitallogic/msm586seg/auto.c index aeddc24fd7..6b284a850b 100644 --- a/src/mainboard/digitallogic/msm586seg/auto.c +++ b/src/mainboard/digitallogic/msm586seg/auto.c @@ -50,10 +50,6 @@ struct mem_controller { int i; }; -static void hard_reset(void) -{ -} - static void memreset_setup(void) { } -- cgit v1.2.3