Fixed TFTP bug for multi-boot DEV.MCSDK.02.00.00.IBL.MULTI_BOOT
authorHao Zhang <hzhang@ti.com>
Thu, 28 Apr 2011 22:11:24 +0000 (18:11 -0400)
committerBill Mills <wmills@ti.com>
Mon, 9 May 2011 17:05:14 +0000 (13:05 -0400)
src/ethboot/ethboot.c
src/util/i2cConfig/i2cConfig.gel

index 56c480e5789fd16ead74da3e50fec6cd6c3ede80..163a411b1133e81a85d9e0e3a6e49eb0954fff14 100644 (file)
@@ -131,7 +131,7 @@ void iblEthBoot (Int32 eIdx)
     /* SGMII configuration. If sgmii is not present this statement is defined
      * to void in target.h */
     for (n = 0; n < ibl_N_ETH_PORTS; n++)  {
-        if (ibl.sgmiiConfig[eIdx].configure == TRUE)
+        if (ibl.sgmiiConfig[n].configure == TRUE)
             hwSgmiiConfig (n, &ibl.sgmiiConfig[n]);
     }
 
index 6fad5fc7e751089fedd478081a447dfc3acb9ae2..64fa4784935d8e300bb3930cbe7fee7e72d9cc6d 100755 (executable)
@@ -748,12 +748,12 @@ hotmenu setConfig_c6678_main()
        ibl.bootModes[2].u.ethBoot.doBootp          = FALSE;
        ibl.bootModes[2].u.ethBoot.useBootpServerIp = FALSE;
        ibl.bootModes[2].u.ethBoot.useBootpFileName = FALSE;
-       ibl.bootModes[2].u.ethBoot.bootFormat       = ibl_BOOT_FORMAT_ELF;
+       ibl.bootModes[2].u.ethBoot.bootFormat       = ibl_BOOT_FORMAT_BBLOB;
 
 
-    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.ipAddr,    192,168,1,100);
-    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.serverIp,  192,168,1,101);
-    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.gatewayIp, 192,168,1,1);
+    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.ipAddr,    192,168,2,100);
+    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.serverIp,  192,168,2,101);
+    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.gatewayIp, 192,168,2,1);
     SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.netmask,   255,255,255,0);
 
     /* Use the e-fuse value */
@@ -946,12 +946,12 @@ hotmenu setConfig_c6670_main()
        ibl.bootModes[2].u.ethBoot.doBootp          = FALSE;
        ibl.bootModes[2].u.ethBoot.useBootpServerIp = FALSE;
        ibl.bootModes[2].u.ethBoot.useBootpFileName = FALSE;
-       ibl.bootModes[2].u.ethBoot.bootFormat       = ibl_BOOT_FORMAT_ELF;
+       ibl.bootModes[2].u.ethBoot.bootFormat       = ibl_BOOT_FORMAT_BBLOB;
 
 
-    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.ipAddr,    192,168,1,100);
-    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.serverIp,  192,168,1,101);
-    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.gatewayIp, 192,168,1,1);
+    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.ipAddr,    192,168,2,100);
+    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.serverIp,  192,168,2,101);
+    SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.gatewayIp, 192,168,2,1);
     SETIP(ibl.bootModes[2].u.ethBoot.ethInfo.netmask,   255,255,255,0);
 
     /* Use the e-fuse value */