summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-07-19 14:49:35 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-07-19 14:49:35 +0200
commitbd3143f040ab186f8b665b3ada35840e3fc491e9 (patch)
treea84d3b938d5d35f1374515eb5ecedeeb6dff8c03 /include/configs
parentedd0b509bad5e8e9dc3b01e9805cf6da5e4343dd (diff)
downloadu-boot-imx-bd3143f040ab186f8b665b3ada35840e3fc491e9.zip
u-boot-imx-bd3143f040ab186f8b665b3ada35840e3fc491e9.tar.gz
u-boot-imx-bd3143f040ab186f8b665b3ada35840e3fc491e9.tar.bz2
Fix support for PS/2 keyboard on TQM85xx boards
The PS/2 keyobard driver for the TQM85xx modules only supports the internal DUART of the MPC85xx CPU. Since the MPC8560 doesn't include a DUART, the TQM8560 modules can't be used with the PS/2 keyboard controller on the STK85xx board. The PS/2 keyboard driver should work with the modules TQM8540, TQM8541 and TQM8555, but it only has been tested on a TQM8540, yet. Make sure the PS/2 controller on the STK85xx is programmed. Jumper settings: X66 1-2, 9-10; X61 2-3 Patch by Martin Krause, 21 Jun 2006
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/TQM85xx.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index da6946b..bda85e0 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -178,11 +178,13 @@
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
/* PS/2 Keyboard */
+#if !defined(CONFIG_TQM8560)
#define CONFIG_PS2KBD /* AT-PS/2 Keyboard */
#define CONFIG_PS2MULT /* .. on PS/2 Multiplexer */
#define CONFIG_PS2SERIAL 2 /* .. on DUART2 */
#define CONFIG_PS2MULT_DELAY (CFG_HZ/2) /* Initial delay */
#define CONFIG_BOARD_EARLY_INIT_R 1
+#endif /* !CONFIG_TQM8560 */
/* Use the HUSH parser */
#define CFG_HUSH_PARSER