X-Git-Url: https://git.ti.com/gitweb?p=keystone-rtos%2Fibl.git;a=blobdiff_plain;f=src%2Fnandboot%2Fnandboot.c;h=b155f66d014c74a6a8dd02e058cca798055fe7e5;hp=d4fc7cdc37914b9e5ac2f3a00ba1191a8dcd66a8;hb=e5a57fce2c8bc5cfd010b74ab5809c92cb064181;hpb=1886a924dcb3d781e00d4d0e8572b97ad7bb25cc

diff --git a/src/nandboot/nandboot.c b/src/nandboot/nandboot.c
index d4fc7cd..b155f66 100644
--- a/src/nandboot/nandboot.c
+++ b/src/nandboot/nandboot.c
@@ -1,3 +1,40 @@
+/*
+ *
+ * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ 
+ * 
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+
+
 /*********************************************************************************** 
  * FILE PURPOSE: The NAND boot wrapper
  ***********************************************************************************
@@ -17,15 +54,21 @@
 #include "nand.h"
 #include "device.h"
 
+/** 
+ * @brief
+ *   Nandboot is disabled through iblcfg.h. Disable the definition for the compilation
+ */
+#ifdef iblNandBoot
+ #undef iblNandBoot
+#endif
+
 
-void iblNandBoot (void)
+void iblNandBoot (int32 eIdx)
 {
     Uint32 entry;
+    Int32  ret;
     void   (*exit)();
 
-    /* Power up the device */
-    if (devicePowerPeriph (TARGET_PWR_NAND) < 0)
-        return;
 
 
     /* Perform any device specific configurations */
@@ -34,11 +77,11 @@ void iblNandBoot (void)
 
 
     /* Open the nand driver */
-    if ((*nand_boot_module.open) ((void *)&ibl.nandConfig, NULL))
+    if ((*nand_boot_module.open) ((void *)&ibl.bootModes[eIdx].u.nandBoot, NULL))
         return;
 
 
-    entry = iblBoot (&nand_boot_module, ibl.nandConfig.bootFormat, &ibl.nandConfig.blob);
+    entry = iblBoot (&nand_boot_module, ibl.bootModes[eIdx].u.nandBoot.bootFormat, &ibl.bootModes[eIdx].u.nandBoot.blob[iblEndianIdx][iblImageIdx]);
 
     (*nand_boot_module.close)();
 
@@ -50,6 +93,6 @@ void iblNandBoot (void)
             
     }
 
-  } 
+}