summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2012-07-19 09:18:17 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2012-07-25 13:51:51 +0200
commitb0753c33a03e193e6225ebb4b9dc3f789fe1b89a (patch)
treed99e147e52e1afbbf4fefa9ae20612615f56261f /c
parentbsp/mpc55xx: Whitespace changes (diff)
downloadrtems-b0753c33a03e193e6225ebb4b9dc3f789fe1b89a.tar.bz2
bsp/mpc55xx: Add MPC55XX_CONSOLE_MINOR
Remove MPC55XX_ESCI_CONSOLE_MINOR.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac8
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c3
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/include/bspopts.h.in6
3 files changed, 9 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
index 63d516ffe1..1cd019f164 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
@@ -39,10 +39,10 @@ RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[*],[63])
RTEMS_BSPOPTS_HELP([BSP_INTERRUPT_HANDLER_TABLE_SIZE],
[defines the maximum number of interrupt handlers])
-RTEMS_BSPOPTS_SET([MPC55XX_ESCI_CONSOLE_MINOR],[mpc5674f_ecu508*],[2])
-RTEMS_BSPOPTS_SET([MPC55XX_ESCI_CONSOLE_MINOR],[*],[0])
-RTEMS_BSPOPTS_HELP([MPC55XX_ESCI_CONSOLE_MINOR],
-[determines which eSCI device will be registered as /dev/console])
+RTEMS_BSPOPTS_SET([MPC55XX_CONSOLE_MINOR],[mpc5674f_ecu508*],[2])
+RTEMS_BSPOPTS_SET([MPC55XX_CONSOLE_MINOR],[*],[0])
+RTEMS_BSPOPTS_HELP([MPC55XX_CONSOLE_MINOR],
+[determines which serial device will be registered as /dev/console])
RTEMS_BSPOPTS_SET([MPC55XX_ESCI_USE_INTERRUPTS],[*],[1])
RTEMS_BSPOPTS_HELP([MPC55XX_ESCI_USE_INTERRUPTS],
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c
index 4f74b38394..9557699799 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-config.c
@@ -12,6 +12,7 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <bsp.h>
#include <bsp/console-generic.h>
#include <bsp/console-esci.h>
#include <bsp/console-linflex.h>
@@ -37,4 +38,4 @@ CONSOLE_GENERIC_INFO_TABLE = {
CONSOLE_GENERIC_INFO_COUNT;
-CONSOLE_GENERIC_MINOR(0);
+CONSOLE_GENERIC_MINOR(MPC55XX_CONSOLE_MINOR);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bspopts.h.in b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bspopts.h.in
index a65341574b..46c7dc8f14 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bspopts.h.in
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bspopts.h.in
@@ -54,15 +54,15 @@
channel) */
#undef MPC55XX_CLOCK_PIT_CHANNEL
+/* determines which serial device will be registered as /dev/console */
+#undef MPC55XX_CONSOLE_MINOR
+
/* size of the early initialization stack in bytes */
#undef MPC55XX_EARLY_STACK_SIZE
/* Must be defined to set the EMIOS prescaler */
#undef MPC55XX_EMIOS_PRESCALER
-/* determines which eSCI device will be registered as /dev/console */
-#undef MPC55XX_ESCI_CONSOLE_MINOR
-
/* define to zero or one to disable or enable interrupts for the eSCI devices
*/
#undef MPC55XX_ESCI_USE_INTERRUPTS