rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / board / mpl / common / kbd.c

diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c
index 931ed43083a6d9430ff171114b8c41779ac5d370..a457635d4de010e4fad90cabe10acfd90f19b381 100644 (file)
--- a/board/mpl/common/kbd.c
+++ b/board/mpl/common/kbd.c
@@ -203,7 +203,7 @@ int isa_kbd_init(void)
        }
 }
 
-#ifdef CFG_CONSOLE_OVERWRITE_ROUTINE
+#ifdef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 extern int overwrite_console (void);
 #else
 int overwrite_console (void)
@@ -452,22 +452,22 @@ unsigned char handle_kbd_event(void)
  */
 unsigned char kbd_read_status(void)
 {
-       return(in8(CFG_ISA_IO_BASE_ADDRESS + KDB_COMMAND_PORT));
+       return(in8(CONFIG_SYS_ISA_IO_BASE_ADDRESS + KDB_COMMAND_PORT));
 }
 
 unsigned char kbd_read_input(void)
 {
-       return(in8(CFG_ISA_IO_BASE_ADDRESS + KDB_DATA_PORT));
+       return(in8(CONFIG_SYS_ISA_IO_BASE_ADDRESS + KDB_DATA_PORT));
 }
 
 void kbd_write_command(unsigned char cmd)
 {
-       out8(CFG_ISA_IO_BASE_ADDRESS + KDB_COMMAND_PORT,cmd);
+       out8(CONFIG_SYS_ISA_IO_BASE_ADDRESS + KDB_COMMAND_PORT,cmd);
 }
 
 void kbd_write_output(unsigned char data)
 {
-       out8(CFG_ISA_IO_BASE_ADDRESS + KDB_DATA_PORT, data);
+       out8(CONFIG_SYS_ISA_IO_BASE_ADDRESS + KDB_DATA_PORT, data);
 }
 
 int kbd_read_data(void)
@@ -475,7 +475,7 @@ int kbd_read_data(void)
        int val;
        unsigned char status;
 
-       val=-1;
+       val = -1;
        status = kbd_read_status();
        if (status & KBD_STAT_OBF) {
                val = kbd_read_input();