3 files changed, 13 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
index 8ef495208e..8b7fefd199 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
@@ -53,8 +53,13 @@ extern int rtems_leon_open_eth_driver_attach (struct rtems_bsdnet_ifconfig *conf
 extern int rtems_smc91111_driver_attach_leon2(struct rtems_bsdnet_ifconfig *config);
 #define RTEMS_BSP_NETWORK_DRIVER_NAME	"open_eth1"
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH_OPENETH	 rtems_leon_open_eth_driver_attach
+#define RTEMS_BSP_NETWORK_DRIVER_NAME_SMC91111	"smc_eth1"
 #define RTEMS_BSP_NETWORK_DRIVER_ATTACH_SMC91111 rtems_smc91111_driver_attach_leon2
 
+#ifndef RTEMS_BSP_NETWORK_DRIVER_NAME
+#define RTEMS_BSP_NETWORK_DRIVER_NAME   RTEMS_BSP_NETWORK_DRIVER_NAME_OPENETH
+#endif
+
 /*
  *  Define the time limits for RTEMS Test Suite test durations.
  *  Long test and short test duration limits are provided.  These
diff --git a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
index 6862b194cb..cf9c73f76d 100644
--- a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
+++ b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
@@ -33,7 +33,7 @@ scmv91111_configuration_t leon_scmv91111_configuration = {
   SMC91111_BASE_ADDR, /* base address */ 
   SMC91111_BASE_IRQ,  /* vector number */ 
   SMC91111_BASE_PIO,  /* PIO */ 
-  10,                 /* 10b */
+  100,                 /* 100b */
   1,                  /* fulldx */
   1                   /* autoneg */
 };
@@ -49,16 +49,13 @@ int _rtems_smc91111_driver_attach(
 int rtems_smc91111_driver_attach_leon2(struct rtems_bsdnet_ifconfig *config)
 {
 
-  if (LEON_REG.Scaler_Reload >= 49)
-    leon_scmv91111_configuration.ctl_rspeed = 100;
-
   /* activate io area */
-  DEBUG_puts("Activating Leon2 io port\n");
+
   /*configure pio */
   *((volatile unsigned int *)0x80000000) |= 0x10f80000;
   *((volatile unsigned int *)0x800000A8) |=
-    (0xe0 | leon_scmv91111_configuration.vector)
-      << (8 * (leon_scmv91111_configuration.pio - 4));
+    (0xe0 | leon_scmv91111_configuration.pio)
+      << (8 * ((leon_scmv91111_configuration.vector & 0x0f) - 4));
   
   return _rtems_smc91111_driver_attach(config,&leon_scmv91111_configuration);
 
diff --git a/c/src/lib/libbsp/sparc/leon2/tools/Makefile.am b/c/src/lib/libbsp/sparc/leon2/tools/Makefile.am
index 72682c3c60..1247898355 100644
--- a/c/src/lib/libbsp/sparc/leon2/tools/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/tools/Makefile.am
@@ -5,16 +5,15 @@
 ACLOCAL_AMFLAGS = -I ../../../../../../../aclocal
 
 transform =
-bsptools_bindir = ${exec_prefix}/@RTEMS_BSP@/tests
+bsptools_bindir = $(PROJECT_ROOT)/@RTEMS_BSP@/tests
 bsptools_bin_SCRIPTS = runtest
 
-TMPINSTALL_FILES = $(PROJECT_ROOT)/@RTEMS_BSP@/tests \
-    $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest
+TMPINSTALL_FILES = $(bsptools_bindir) $(bsptools_bindir)/runtest
 
-$(PROJECT_ROOT)/@RTEMS_BSP@:
+$(bsptools_bindir):
 	$(mkinstalldirs) $@
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/runtest: runtest
+$(bsptools_bindir)/runtest: runtest
 	$(INSTALL_SCRIPT) $< $@
 
 all-local: $(TMPINSTALL_FILES)