]> git.sur5r.net Git - u-boot/commitdiff
Few V38B changes:
authorBartlomiej Sieka <tur@semihalf.com>
Thu, 28 Dec 2006 18:08:21 +0000 (19:08 +0100)
committerBartlomiej Sieka <tur@semihalf.com>
Thu, 28 Dec 2006 18:08:21 +0000 (19:08 +0100)
  - fix a typo in V38B config file
  - move watchdog initialisation earlier in the boot process
  - add "wdt=off" to default kernel command line (disables kernel watchdog)

board/v38b/v38b.c
include/configs/v38b.h

index dede996880124cc2053fc86c01a6b66fb36256ae..ace4aa2caed9f437df82d1571827de84b4465304 100644 (file)
@@ -191,16 +191,8 @@ int checkboard (void)
        return 0;
 }
 
-
-int board_early_init_r(void)
+int board_early_init_f(void)
 {
-       /*
-        * Now, when we are in RAM, enable flash write access for the
-        * detection process.  Note that CS_BOOT cannot be cleared when
-        * executing in flash.
-        */
-       *(vu_long *) MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
-
 #ifdef CONFIG_HW_WATCHDOG
        /*
         * Enable and configure the direction (output) of PSC3_9 - watchdog
@@ -210,6 +202,17 @@ int board_early_init_r(void)
        *(vu_long *) MPC5XXX_WU_GPIO_ENABLE |= GPIO_PSC3_9;
        *(vu_long *) MPC5XXX_WU_GPIO_DIR |= GPIO_PSC3_9;
 #endif /* CONFIG_HW_WATCHDOG */
+       return 0;
+}
+
+int board_early_init_r(void)
+{
+       /*
+        * Now, when we are in RAM, enable flash write access for the
+        * detection process.  Note that CS_BOOT cannot be cleared when
+        * executing in flash.
+        */
+       *(vu_long *) MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
 
        /*
         * Enable GPIO_WKUP_7 to "read the status of the actual power
index 554a7a41b8e60516e88c92132c9541631184fb18..e19591d2993e7ca20c585ac74e182bd839812297 100644 (file)
@@ -39,6 +39,7 @@
 #define CONFIG_NETCONSOLE              1
 
 #define CONFIG_BOARD_EARLY_INIT_R      1       /* do board-specific init */
+#define CONFIG_BOARD_EARLY_INIT_F      1       /* do board-specific init */
 
 #define CFG_XLB_PIPELINING             1       /* gives better performance */
 
                                 CFG_CMD_IRQ    | \
                                 CFG_CMD_JFFS2  | \
                                 CFG_CMD_MII    | \
-                                CFG_CMD_SDRAMi | \
+                                CFG_CMD_SDRAM  | \
                                 CFG_CMD_DATE   | \
                                 CFG_CMD_USB    | \
                                 CFG_CMD_FAT)
        "preboot=echo;echo Type \"run flash_nfs\" to mount root "       \
                "filesystem over NFS; echo\0"                           \
        "netdev=eth0\0"                                                 \
-       "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
+       "ramargs=setenv bootargs root=/dev/ram rw wdt=off \0"           \
        "addip=setenv bootargs $(bootargs) "                            \
                "ip=$(ipaddr):$(serverip):$(gatewayip):"                \
                "$(netmask):$(hostname):$(netdev):off panic=1\0"        \
                "$(ramdisk_addr)\0"                                     \
        "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=$(serverip):$(rootpath) wdt=off\0"             \
        "hostname=v38b\0"                                               \
        "ethact=FEC ETHERNET\0"                                         \
        "rootpath=/opt/eldk-3.1.1/ppc_6xx\0"                            \