Corrected merge for 6657 ibl

[keystone-rtos/ibl.git] / src / main / iblinit.c

diff --git a/src/main/iblinit.c b/src/main/iblinit.c
index ffd62f5f6275b7106ea4773159cec1a31f5b5758..cfe60fa2d4d423bfea660bc5458253d7b97e1ffc 100644 (file)
--- a/src/main/iblinit.c
+++ b/src/main/iblinit.c
@@ -315,15 +315,7 @@ void iblSwap (void)
             ibl.bootModes[i].u.nandBoot.nandInfo.blockOffset   = swap32val(ibl.bootModes[i].u.nandBoot.nandInfo.blockOffset);
             ibl.bootModes[i].u.nandBoot.nandInfo.pageOffset    = swap32val(ibl.bootModes[i].u.nandBoot.nandInfo.pageOffset);
             ibl.bootModes[i].u.nandBoot.nandInfo.columnOffset  = swap32val(ibl.bootModes[i].u.nandBoot.nandInfo.columnOffset);
-            /*for (j = 0; j < ibl_N_ECC_BYTES; j++)
-            {
-                ibl.bootModes[i].u.nandBoot.nandInfo.eccBytesIdx[j] = swap32val(ibl.bootModes[i].u.nandBoot.nandInfo.eccBytesIdx[j]);
-            }
-            for (j = 0; j < ibl_N_BAD_BLOCK_PAGE; j++)
-            {
-                ibl.bootModes[i].u.nandBoot.nandInfo.badBlkMarkIdx[j] = swap32val(ibl.bootModes[i].u.nandBoot.nandInfo.badBlkMarkIdx[j]);
-            }
-            ibl.bootModes[i].u.nandBoot.nandInfo.postCommand      = swap16val(ibl.bootModes[i].u.nandBoot.nandInfo.postCommand);*/
+            ibl.bootModes[i].u.nandBoot.nandInfo.postCommand   = swap16val(ibl.bootModes[i].u.nandBoot.nandInfo.postCommand);
         }  else if (ibl.bootModes[i].bootMode == ibl_BOOT_MODE_NOR)  {
             ibl.bootModes[i].u.norBoot.bootFormat         = swap32val(ibl.bootModes[i].u.norBoot.bootFormat);
             for (j = 0; j < ibl_N_ENDIANS; j++)
@@ -348,6 +340,7 @@ void iblSwap (void)
 
     }
 
+    ibl.iblEvmType = swap16val (ibl.iblEvmType);
     ibl.chkSum = swap16val (ibl.chkSum);
 }
 
@@ -465,7 +458,10 @@ void main (void)
     iblStatus.iblVersion   = ibl_VERSION;
     iblStatus.activeDevice = ibl_ACTIVE_DEVICE_I2C;
 
-
+#ifdef C665x
+     /*Set GPIO as SPI,UART*/
+    configureGPIO();
+#endif
     /* Determine the boot device to read from */
     bootDevice = deviceReadBootDevice();