More GCC 4.x woes

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

diff --git a/board/trab/trab.c b/board/trab/trab.c
index 029fbde8c2fed89dae9d5a163ed156089afc2daf..e8dfd2ceb0b1476dbff743506865e03b885bc664 100644 (file)
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -57,7 +57,7 @@ static void udelay_no_timer (int usec)
        int i;
        int delay = usec * 3;
 
-       for (i = 0; i < delay; i ++) gd->bd->bi_arch_number = 145;
+       for (i = 0; i < delay; i ++) gd->bd->bi_arch_number = MACH_TYPE_TRAB;
 }
 #endif /* CONFIG_MODEM_SUPPORT */
 
@@ -105,10 +105,11 @@ int board_init ()
        gpio->PGUP  = 0x0;
        gpio->OPENCR= 0x0;
 
-       /* arch number of SAMSUNG-Board */
-       /* MACH_TYPE_SMDK2400 */
-       /* XXX this isn't really correct, but keep it for now */
-       gd->bd->bi_arch_number = 145;
+       /* suppress flicker of the VFDs */
+       gpio->MISCCR = 0x40;
+       gpio->PFCON |= (2<<12);
+
+       gd->bd->bi_arch_number = MACH_TYPE_TRAB;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x0c000100;
@@ -165,6 +166,12 @@ int misc_init_r (void)
        uchar *str;
        int i;
 
+#ifdef CONFIG_AUTO_UPDATE
+       extern int do_auto_update(void);
+       /* this has priority over all else */
+       do_auto_update();
+#endif
+
        for (i = 0; i < KEYBD_KEY_NUM; ++i) {
                keybd_env[i] = '0' + ((kbd_data >> i) & 1);
        }