summaryrefslogtreecommitdiff
path: root/src/mainboard/supermicro
diff options
context:
space:
mode:
author- supermicro/x6dhe_g/auto.c <- supermicro/x6dhe_g/auto.c>2009-10-24 19:17:24 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-10-24 19:17:24 +0000
commitd1327ce9639645f84024ddd66d2b11f57619d8e6 (patch)
tree3cc499edbe6fc9a91235f466514f34485bfd68b3 /src/mainboard/supermicro
parent8d2ddff011700744d2374a95f8c807dbdfb85603 (diff)
downloadcoreboot-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/supermicro')
-rw-r--r--src/mainboard/supermicro/h8dme/Config.lb1
-rw-r--r--src/mainboard/supermicro/h8dmr/Config.lb1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/Config.lb1
-rw-r--r--src/mainboard/supermicro/x6dai_g/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dai_g/Makefile.inc2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Makefile.inc2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/auto.c10
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Makefile.inc2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/auto.c10
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/auto.updated.c10
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Makefile.inc2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/auto.c10
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Config.lb2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Makefile.inc2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/auto.c10
18 files changed, 10 insertions, 63 deletions
diff --git a/src/mainboard/supermicro/h8dme/Config.lb b/src/mainboard/supermicro/h8dme/Config.lb
index 330980514e..b9f14ea4c9 100644
--- a/src/mainboard/supermicro/h8dme/Config.lb
+++ b/src/mainboard/supermicro/h8dme/Config.lb
@@ -32,7 +32,6 @@ object get_bus_conf.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_USE_INIT
makerule ./auto.o
diff --git a/src/mainboard/supermicro/h8dmr/Config.lb b/src/mainboard/supermicro/h8dmr/Config.lb
index 05f4514ed2..a93c3051c3 100644
--- a/src/mainboard/supermicro/h8dmr/Config.lb
+++ b/src/mainboard/supermicro/h8dmr/Config.lb
@@ -35,7 +35,6 @@ object get_bus_conf.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_USE_INIT
makerule ./auto.o
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Config.lb b/src/mainboard/supermicro/h8dmr_fam10/Config.lb
index d3d8fa83ac..945662d135 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Config.lb
+++ b/src/mainboard/supermicro/h8dmr_fam10/Config.lb
@@ -37,7 +37,6 @@ object get_bus_conf.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_USE_INIT
makerule ./auto.o
diff --git a/src/mainboard/supermicro/x6dai_g/Config.lb b/src/mainboard/supermicro/x6dai_g/Config.lb
index 9f94fb494e..17096f5da4 100644
--- a/src/mainboard/supermicro/x6dai_g/Config.lb
+++ b/src/mainboard/supermicro/x6dai_g/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/supermicro/x6dai_g/Makefile.inc b/src/mainboard/supermicro/x6dai_g/Makefile.inc
index e697040c94..455da185cf 100644
--- a/src/mainboard/supermicro/x6dai_g/Makefile.inc
+++ b/src/mainboard/supermicro/x6dai_g/Makefile.inc
@@ -19,6 +19,6 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-
+obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/supermicro/x6dhe_g/Config.lb b/src/mainboard/supermicro/x6dhe_g/Config.lb
index 29ffeba85e..866042b548 100644
--- a/src/mainboard/supermicro/x6dhe_g/Config.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Config.lb
@@ -19,7 +19,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/supermicro/x6dhe_g/Makefile.inc b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
index e697040c94..455da185cf 100644
--- a/src/mainboard/supermicro/x6dhe_g/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
@@ -19,6 +19,6 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-
+obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/supermicro/x6dhe_g/auto.c b/src/mainboard/supermicro/x6dhe_g/auto.c
index 5d80f1e4db..c5725d751f 100644
--- a/src/mainboard/supermicro/x6dhe_g/auto.c
+++ b/src/mainboard/supermicro/x6dhe_g/auto.c
@@ -43,16 +43,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 */
diff --git a/src/mainboard/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb
index 19e210530e..11569d9a5b 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Config.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Config.lb
@@ -19,7 +19,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/supermicro/x6dhe_g2/Makefile.inc b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
index e697040c94..455da185cf 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
@@ -19,6 +19,6 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-
+obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.c b/src/mainboard/supermicro/x6dhe_g2/auto.c
index d8eee227b2..d03d29ed91 100644
--- a/src/mainboard/supermicro/x6dhe_g2/auto.c
+++ b/src/mainboard/supermicro/x6dhe_g2/auto.c
@@ -43,16 +43,6 @@
#define RECVENA_CONFIG 0x0708090a
#define RECVENB_CONFIG 0x0708090a
-#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 */
diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c
index a9509cd5c5..83180ab83d 100644
--- a/src/mainboard/supermicro/x6dhe_g2/auto.updated.c
+++ b/src/mainboard/supermicro/x6dhe_g2/auto.updated.c
@@ -43,16 +43,6 @@
#define RECVENA_CONFIG 0x0708090a
#define RECVENB_CONFIG 0x0708090a
-#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 */
diff --git a/src/mainboard/supermicro/x6dhr_ig/Config.lb b/src/mainboard/supermicro/x6dhr_ig/Config.lb
index 8103171028..dc2dd1265f 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Config.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/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/supermicro/x6dhr_ig/Makefile.inc b/src/mainboard/supermicro/x6dhr_ig/Makefile.inc
index e697040c94..455da185cf 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhr_ig/Makefile.inc
@@ -19,6 +19,6 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-
+obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/supermicro/x6dhr_ig/auto.c b/src/mainboard/supermicro/x6dhr_ig/auto.c
index ee2b7717be..1c152ae624 100644
--- a/src/mainboard/supermicro/x6dhr_ig/auto.c
+++ b/src/mainboard/supermicro/x6dhr_ig/auto.c
@@ -44,16 +44,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 */
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Config.lb b/src/mainboard/supermicro/x6dhr_ig2/Config.lb
index 5e7b3a300b..9e8ce1427a 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Config.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/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/supermicro/x6dhr_ig2/Makefile.inc b/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc
index e697040c94..455da185cf 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhr_ig2/Makefile.inc
@@ -19,6 +19,6 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-
+obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
include $(src)/mainboard/Makefile.romccboard.inc
diff --git a/src/mainboard/supermicro/x6dhr_ig2/auto.c b/src/mainboard/supermicro/x6dhr_ig2/auto.c
index fb5da2a6a8..652c9f518d 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/auto.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/auto.c
@@ -44,16 +44,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 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:07:01 +0000