board/[A-Za-i]*: Remove lingering references to CFG_CMD_* symbols.

[u-boot] / board / uc101 / uc101.c

diff --git a/board/uc101/uc101.c b/board/uc101/uc101.c
index 90624e5cefe1c8f2eaeb6c72c6be2fb726b79195..f7265139653d81691dbd0958a40617da06d3397b 100644 (file)
--- a/board/uc101/uc101.c
+++ b/board/uc101/uc101.c
@@ -65,12 +65,10 @@
 #define GP_SIMP_SET_O(n, v)  (pgpio->simple_dvo = v ? \
                                (pgpio->simple_dvo | (1 << n)) : \
                                (pgpio->simple_dvo & ~(1 << n)) )
-                               
+
 #define GP_SIMP_GET_O(n)  ((pgpio->simple_dvo >> n) & 1)
 #define GP_SIMP_GET_I(n)  ((pgpio->simple_ival >> n) & 1)
 
-
-
 #define GP_SINT_SET_O(n, v)  (pgpio->sint_dvo = v ? \
                                (pgpio->sint_dvo | (1 << n)) : \
                                (pgpio->sint_dvo & ~(1 << n)) )
@@ -172,9 +170,9 @@ long int initdram (int board_type)
 
        /* find RAM size using SDRAM CS0 only */
        sdram_start(0);
-       test1 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x20000000);
+       test1 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
        sdram_start(1);
-       test2 = get_ram_size((ulong *)CFG_SDRAM_BASE, 0x20000000);
+       test2 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
        if (test1 > test2) {
                sdram_start(0);
                dramsize = test1;
@@ -223,12 +221,14 @@ long int initdram (int board_type)
 int checkboard (void)
 {
        puts ("Board: MAN UC101\n");
+       /* clear the Display */
+       *(char *)(CFG_DISP_CWORD) = 0x80;
        return 0;
 }
 
 static void init_ports (void)
 {
-       volatile struct mpc5xxx_gpio *pgpio = 
+       volatile struct mpc5xxx_gpio *pgpio =
                (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
 
        GP_SIMP_ENABLE_I(GPIO_USB_8);   /* HEX Bit 3 */
@@ -268,7 +268,7 @@ struct kbd_data_t* get_keys (struct kbd_data_t *kbd_data)
        return kbd_data;
 }
 
-static int compare_magic (const struct kbd_data_t *kbd_data, uchar *str)
+static int compare_magic (const struct kbd_data_t *kbd_data, char *str)
 {
        char s1 = str[0];
 
@@ -285,11 +285,11 @@ static int compare_magic (const struct kbd_data_t *kbd_data, uchar *str)
        return 0;
 }
 
-static uchar *key_match (const struct kbd_data_t *kbd_data)
+static char *key_match (const struct kbd_data_t *kbd_data)
 {
-       uchar magic[sizeof (kbd_magic_prefix) + 1];
-       uchar *suffix;
-       uchar *kbd_magic_keys;
+       char magic[sizeof (kbd_magic_prefix) + 1];
+       char *suffix;
+       char *kbd_magic_keys;
 
        /*
         * The following string defines the characters that can be appended
@@ -310,7 +310,7 @@ static uchar *key_match (const struct kbd_data_t *kbd_data)
                sprintf (magic, "%s%c", kbd_magic_prefix, *suffix);
 
                if (compare_magic(kbd_data, getenv(magic)) == 0) {
-                       uchar cmd_name[sizeof (kbd_command_prefix) + 1];
+                       char cmd_name[sizeof (kbd_command_prefix) + 1];
                        char *cmd;
 
                        sprintf (cmd_name, "%s%c", kbd_command_prefix, *suffix);
@@ -333,7 +333,7 @@ int misc_init_r (void)
 #ifdef CONFIG_PREBOOT
        struct kbd_data_t kbd_data;
        /* Decode keys */
-       uchar *str = strdup (key_match (get_keys (&kbd_data)));
+       char *str = strdup (key_match (get_keys (&kbd_data)));
        /* Set or delete definition */
        setenv ("preboot", str);
        free (str);
@@ -371,4 +371,3 @@ void hw_watchdog_reset(void)
        *(vu_long *)MPC5XXX_GPT0_ENABLE = GPT_OUT_0;
 }
 #endif
-