diff options
| author | - supermicro/x6dhe_g/auto.c <- supermicro/x6dhe_g/auto.c> | 2009-10-24 19:17:24 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2009-10-24 19:17:24 +0000 |
| commit | d1327ce9639645f84024ddd66d2b11f57619d8e6 (patch) | |
| tree | 3cc499edbe6fc9a91235f466514f34485bfd68b3 /src/mainboard/dell/s1850 | |
| parent | 8d2ddff011700744d2374a95f8c807dbdfb85603 (diff) | |
| download | coreboot-d1327ce9639645f84024ddd66d2b11f57619d8e6.tar.xz | |
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 <uwe@hermann-uwe.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4849 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/dell/s1850')
| -rw-r--r-- | src/mainboard/dell/s1850/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/dell/s1850/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/dell/s1850/auto.c | 10 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb index 58f55c644a..cc0edc6a8b 100644 --- a/src/mainboard/dell/s1850/Config.lb +++ b/src/mainboard/dell/s1850/Config.lb @@ -20,7 +20,7 @@ arch i386 end driver mainboard.o if CONFIG_GENERATE_MP_TABLE object mptable.o end if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -object reset.o +if CONFIG_HAVE_HARD_RESET object reset.o end ## ## Romcc output diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc index 61fcddf7d5..204487a139 100644 --- a/src/mainboard/dell/s1850/Makefile.inc +++ b/src/mainboard/dell/s1850/Makefile.inc @@ -42,6 +42,7 @@ driver-y += mainboard.o obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_HAVE_HARD_RESET) += reset.o ifdef POST_EVALUATION diff --git a/src/mainboard/dell/s1850/auto.c b/src/mainboard/dell/s1850/auto.c index 16b564b02c..a7b2b925cb 100644 --- a/src/mainboard/dell/s1850/auto.c +++ b/src/mainboard/dell/s1850/auto.c @@ -42,16 +42,6 @@ #define RECVENA_CONFIG 0x0808090a #define RECVENB_CONFIG 0x0808090a -#if 0 -static void hard_reset(void) -{ - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} -#endif - static inline void activate_spd_rom(const struct mem_controller *ctrl) { /* nothing to do */ |