diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/README.txt b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/README.txt
index 8f58992e..c4d32efe 100755
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/README.txt
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/README.txt
@@ -1,10 +1 @@
-NandPsu Integration test
-
-- On R5 processors, you may get compilation error for bsp stating "undefined reference to `end'"
-  Add end = .;  at the end of the linker script to remove this error
-
-  } > ps8_ocm_ram_0_S_AXI_BASEADDR
-
-  _end = .;
-  end = .;
-}
+Empty application. Add your own sources.
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/ct.h b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/ct.h
old mode 100644
new mode 100755
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/ct_standalone.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/ct_standalone.c
old mode 100644
new mode 100755
index 2c5be7b7..c50483b3
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/ct_standalone.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/ct_standalone.c
@@ -58,7 +58,6 @@
 ******************************************************************************/
 
 /***************************** Include Files *********************************/
-
 #include <string.h>
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.c
old mode 100644
new mode 100755
index b2bf56af..e15341f7
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.c
@@ -63,7 +63,6 @@
 /***************************** Include Files *********************************/
 
 #include "intg.h"
-#include <stdio.h>
 
 /************************** Constant Definitions *****************************/
 
@@ -112,7 +111,8 @@
  * @{
  */
 #define MENU_UTIL_DATA_INTERFACE		1
-#define MENU_UTIL_FLASH_DETAILS			2
+#define MENU_UTIL_OOB_MODE			2
+#define MENU_UTIL_DMA_MODE			3
 #define MENU_UTIL_EXIT				99
 /*@}*/
 
@@ -125,30 +125,7 @@ typedef enum TimingMode {
 	Mode5
 }NandPsu_TimingMode;
 
-/*
- * Uncomment the following constant definition if UART16550 is standard output
- * device. If UartLite is standard output device, comment the definition
- */
-//#define UART16550
 
-/*
- * Uncomment the following constant definition if UARTLITE is standard output
- * device. If UART16550 is standard output device, comment the definition
- */
-//#define UARTLITE
-
-#ifdef UART16550
-#include "xuartns550_l.h"
-#define UART_BASEADDR XPAR_RS232_UART_BASEADDR
-#elif UARTLITE
-#include "xuartlite_l.h"
-#define UART_BASEADDR XPAR_UARTLITE_BASEADDR
-#else
-#include "xuartps_hw.h"
-#define UART_BASEADDR XPS_UART1_BASEADDR	/**< UART-1 Base Address */
-#endif
-
-//#define printf xil_printf
 /**************************** Type Definitions *******************************/
 
 /***************** Macros (Inline Functions) Definitions *********************/
@@ -164,6 +141,8 @@ u8 WriteBuffer[TEST_BUF_SIZE] __attribute__ ((aligned(64)));/**< write buffer */
  */
 XNandPsu NandInstance;
 XNandPsu *NandInstPtr = &NandInstance;
+
+s32 MismatchCounter;
 /************************** Function Prototypes ******************************/
 
 static unsigned int GetUserInput(char* Prompt, char* Response,
@@ -172,10 +151,6 @@ static unsigned int GetUserInput(char* Prompt, char* Response,
 static int  GetMainMenuCommand(char* CmdLine);
 static void RunTestMenu(char* CmdLine);
 static void RunUtilMenu(char* CmdLine);
-static int ChangeTimingMode(XNandPsu *NandInstPtr,
-				XNandPsu_DataInterface NewIntf,
-				XNandPsu_TimingMode NewMode);
-
 extern char inbyte ();		/**< Inbyte returns the byte received by device. */
 s32 FlashInit(u16 NandDeviceId);
 #ifdef AUTOMATIC_TEST_MODE
@@ -284,15 +259,15 @@ void Intg_Entry(void)
 #endif
 
 	/* print banner */
-	printf("\r\n\r\nNand Driver Integration Test\r\n");
-	printf("Created on %s\n\n\r", __DATE__);
+	printf("\r\n\r\nNand Driver Integration Test\r\n"
+			"Created on %s\n\n\r", __DATE__);
 	printf("=====================================================\r\n");
 
 	CT_Init();
 
 	Status = FlashInit(NAND_DEVICE_ID);
 	if(Status != XST_SUCCESS){
-		printf("Nand Flash Initialization Failed\r\n");
+		printf("Flash Initialization Failed\r\n");
 		goto Out;
 	}
 	printf("Flash initialization done\r\n");
@@ -309,12 +284,11 @@ void Intg_Entry(void)
 				break;
 
 			case MENU_MAIN_EXIT:
-				printf("\r\nByebye! Thanks for using Nand ");
-				printf("and Driver integration tests :)\r\n");
+				printf("\r\nByebye!\r\n");
 				return;
 
 			default:
-				printf("Invalid selections\r\n");
+				printf("Invalid selection\r\n");
 		}
 	}
 #else
@@ -325,18 +299,20 @@ void Intg_Entry(void)
 	/*
 	 * Setting Interface
 	 */
-	NandInstPtr->DataInterface = SDR;
+	NandInstPtr->DataInterface = XNANDPSU_SDR;
 
 	for (t_mode = Mode0; t_mode <= Mode5; t_mode++){
-		NandInstPtr->DataInterface = SDR;
+		NandInstPtr->DataInterface = XNANDPSU_SDR;
 
 		/*
 		 * Set Timing mode
 		 */
-		Status = ChangeTimingMode(NandInstPtr, SDR, t_mode);
+		Status = XNandPsu_ChangeTimingMode(NandInstPtr, XNANDPSU_SDR, t_mode);
 		if (Status != XST_SUCCESS) {
 			goto Out;
 		}
+		xil_printf("\n\tCurrent Interface is SDR and Timing Mode is %d\r\n",
+					t_mode);
 		/*
 		 * Run the test cases
 		 */
@@ -345,20 +321,35 @@ void Intg_Entry(void)
 
 	for (t_mode = Mode0; t_mode <= Mode5; t_mode++){
 
-		NandInstPtr->DataInterface = NVDDR;
+		NandInstPtr->DataInterface = XNANDPSU_NVDDR;
 		/*
 		 * Set Timing mode
 		 */
-		Status = ChangeTimingMode(NandInstPtr, NVDDR, t_mode);
+		Status = XNandPsu_ChangeTimingMode(NandInstPtr, XNANDPSU_NVDDR,
+					t_mode);
 		if (Status != XST_SUCCESS) {
 			goto Out;
 		}
+		xil_printf("\n\tCurrent Interface is NVDDR and Timing Mode is "
+				"%d\r\n", t_mode);
 		/*
 		 * Run the test cases
 		 */
 		TestFailures += Automode_Tests(TestLoops);
 	}
 
+	/*
+	 * Set No OOB Option and Run Test Cases
+	 */
+	XNandPsu_DisableBbtOobMode(NandInstPtr);
+	printf("NO OOB Mode selected..Scanning for BBT\r\n");
+	Status = XNandPsu_ScanBbt(NandInstPtr);
+	if(Status != XST_SUCCESS){
+		printf("Scan BBT Failed\r\n");
+		goto Out;
+	}
+	TestFailures += Automode_Tests(TestLoops);
+
 	/*
 	 * Run Code Coverage Tests
 	 */
@@ -422,7 +413,7 @@ int CodeCoverage_Tests(int TestLoops)
 {
 	volatile int failures = 0;
 
-	xil_printf("\tRunning Code Coverage Tests Now\r\n");
+	printf("\tRunning Code Coverage Tests Now\r\n");
 
 	XNandPsu_DisableDmaMode(NandInstPtr);
 	failures += Automode_Tests(TestLoops);
@@ -451,8 +442,8 @@ int CodeCoverage_Tests(int TestLoops)
 static int GetMainMenuCommand(char* CmdLine)
 {
 	/* prompt user */
-	printf("\r\n\r\n\r\nMain Menu:\r\n");
-	printf("==========\r\n");
+	printf("\r\n\r\n\r\nMain Menu:\r\n"
+			"==========\r\n");
 	printf("%d  - Test menu\r\n", MENU_MAIN_TEST);
 	printf("%d  - Util menu\r\n", MENU_MAIN_UTIL);
 	printf("%d - Exit\r\n\r\n", MENU_MAIN_EXIT);
@@ -498,12 +489,13 @@ static void RunTestMenu(char* CmdLine)
 		TestFailures = 0;
 
 		/* prompt user */
-		printf("\r\n\r\n\r\nTest Menu:\r\n");
-		printf("==========\r\n");
+		printf("\r\n\r\n\r\nTest Menu:\r\n"
+				"==========\r\n");
 		printf("%d - Run all tests\r\n", MENU_TEST_ALL);
 		printf("%d - Flash Erase Read Test\r\n", MENU_TEST_ERASE_READ);
 		printf("%d - Flash Read Write Test \r\n", MENU_TEST_FLASH_RW);
-		printf("%d - Random Block Flash Read Write Test\r\n", MENU_TEST_RANDOM_RW);
+		printf("%d - Random Block Flash Read Write Test\r\n",
+				MENU_TEST_RANDOM_RW);
 		printf("%d - Spare Bytes Read Write Test \r\n",
 				MENU_TEST_SPAREBYTES_RW);
 		printf("%d - Partial Page Read Write Test\r\n",
@@ -512,8 +504,8 @@ static void RunTestMenu(char* CmdLine)
 		printf("%d - BBT Scan Test.\r\n", MENU_TEST_BBT);
 		printf("%d - Mark Block Bad Test.\r\n", MENU_TEST_MARK_BLOCK_BAD);
 		printf("%d - Exit to main menu\r\n\r\n", MENU_TEST_EXIT);
-		printf("More than one test can be specified\r\n");
-		printf("Adding l <number> sets the number of test loops\n\n");
+		printf("More than one test can be specified\r\n"
+				"Adding l <number> sets the number of test loops\n\n");
 
 		/* wait for input */
 		*CmdLine = '\n';
@@ -652,13 +644,14 @@ static void RunUtilMenu(char* CmdLine)
 
 	while(!QuitToMain) {
 		/* prompt user */
-		printf("\r\n\r\n\r\nUtil Menu:\r\n");
-		printf("==========\r\n");
-		printf("%d - Change Data Interface Timing mode- 0 for SDR, 1 for NVDDR"
+		printf("\r\n\r\n\r\nUtil Menu:\r\n"
+				"==========\r\n");
+		printf("%d - Set Data Interface Timing Mode"
 				"\r\n",MENU_UTIL_DATA_INTERFACE);
-		printf("%d - Print Flash Details\r\n",
-				MENU_UTIL_FLASH_DETAILS);
-
+		printf("%d - Set OOB MODE\r\n",
+						MENU_UTIL_OOB_MODE);
+		printf("%d - Set DMA MODE\r\n",
+						MENU_UTIL_DMA_MODE);
 		/* wait for input */
 		*CmdLine = '\n';
 		while(*CmdLine == '\n') {
@@ -669,7 +662,7 @@ static void RunUtilMenu(char* CmdLine)
 		/* execute selection */
 		switch(atoi(CmdLine)) {
 			case MENU_UTIL_DATA_INTERFACE:
-				printf("Type 0 for SDR, 1 for NVDDR\r\n");
+				printf(" 0. SDR \r\n 1. NVDDR\r\n");
 				/* wait for input */
 				*CmdLine = '\n';
 				while(*CmdLine == '\n') {
@@ -677,38 +670,25 @@ static void RunUtilMenu(char* CmdLine)
 					GetUserInput(0, CmdLine, 131);
 				}
 				switch(atoi(CmdLine)) {
-					case SDR:
-						printf("Enter Timing Mode : 0 - 5 for SDR Interface : ");
+					case XNANDPSU_SDR:
+						printf("Enter Timing Mode (0 - 5): ");
 						/* wait for input */
 						*CmdLine = '\n';
 						while(*CmdLine == '\n') {
 							GetUserInput(0, CmdLine, 131);
 						}
 						if((u8)atoi(CmdLine) >= 0 && (u8)atoi(CmdLine) <= 5){
-							Status = ChangeTimingMode(NandInstPtr,SDR,(u8)atoi(CmdLine));
+							Status = XNandPsu_ChangeTimingMode(NandInstPtr,
+									XNANDPSU_SDR,atoi(CmdLine));
 							if (Status != XST_SUCCESS) {
 								printf("Data Interface / Timing Mode Change"
 										" failed\r\n");
 							}
-
-						}
-						else{
-							printf("Invalid Input\n\r");
-						}
-						break;
-
-					case NVDDR:
-						printf("Enter Timing Mode : 0 - 5 for NVDDR Interface : ");
-						/* wait for input */
-						*CmdLine = '\n';
-						while(*CmdLine == '\n') {
-							GetUserInput(0, CmdLine, 131);
-						}
-						if((u8)atoi(CmdLine) >= 0 && (u8)atoi(CmdLine) <= 5){
-							Status = ChangeTimingMode(NandInstPtr,NVDDR,(XNandPsu_TimingMode)atoi(CmdLine));
-							if (Status != XST_SUCCESS) {
-								printf("Data Interface / Timing Mode Change"
-										" failed\r\n");
+							else{
+								printf("\tCurrent Interface type : %d, Timing "
+										"mode is %d\r\n\n",
+										NandInstPtr->DataInterface,
+										NandInstPtr->TimingMode);
 							}
 						}
 						else{
@@ -716,32 +696,86 @@ static void RunUtilMenu(char* CmdLine)
 						}
 						break;
 
+					case XNANDPSU_NVDDR:
+						printf("Enter Timing Mode (0 - 5) : ");
+						/* wait for input */
+						*CmdLine = '\n';
+						while(*CmdLine == '\n') {
+							GetUserInput(0, CmdLine, 131);
+						}
+						if((u8)atoi(CmdLine) >= 0 && (u8)atoi(CmdLine) <= 5){
+							Status = XNandPsu_ChangeTimingMode(NandInstPtr,
+									XNANDPSU_NVDDR,atoi(CmdLine));
+							if (Status != XST_SUCCESS) {
+								printf("Data Interface / Timing Mode Change"
+										" failed\r\n");
+							}
+							else{
+								printf("\tCurrent Interface type : %d, Timing "
+										"mode is %d\r\n\n",
+										NandInstPtr->DataInterface,
+										NandInstPtr->TimingMode - 16);
+							}
+						}
+						else{
+							printf("Invalid Input\n\r");
+						}
+						break;
 					default:
 						printf("Invalid selection\r\n");
 				}
 				break;
-
-			case MENU_UTIL_FLASH_DETAILS:
-				xil_printf("Bytes Per Page: 0x%x\r\n",
-						NandInstPtr->Geometry.BytesPerPage);
-				xil_printf("Spare Bytes Per Page: 0x%x\r\n",
-						NandInstPtr->Geometry.SpareBytesPerPage);
-				xil_printf("Pages Per Block: 0x%x\r\n",
-						NandInstPtr->Geometry.PagesPerBlock);
-				xil_printf("Blocks Per LUN: 0x%x\r\n",
-						NandInstPtr->Geometry.BlocksPerLun);
-				xil_printf("Number of LUNs: 0x%x\r\n",
-						NandInstPtr->Geometry.NumLuns);
-				xil_printf("Number of bits per cell: 0x%x\r\n",
-						NandInstPtr->Geometry.NumBitsPerCell);
-				xil_printf("Number of ECC bits: 0x%x\r\n",
-						NandInstPtr->Geometry.NumBitsECC);
-				xil_printf("Block Size: 0x%x\r\n",
-						NandInstPtr->Geometry.BlockSize);
-				xil_printf("Number of Target Blocks: 0x%x\r\n",
-						NandInstPtr->Geometry.NumTargetBlocks);
-				xil_printf("Number of Target Pages: 0x%x\r\n",
-						NandInstPtr->Geometry.NumTargetPages);
+			case MENU_UTIL_DMA_MODE:
+				printf("0. Disable DMA Mode\r\n"
+						"1. Enable DMA Mode\r\n");
+				/* wait for input */
+				*CmdLine = '\n';
+				while(*CmdLine == '\n') {
+					printf("Enter selection: ");
+					GetUserInput(0, CmdLine, 131);
+				}
+				switch(atoi(CmdLine)) {
+					case 0:
+						XNandPsu_DisableDmaMode(NandInstPtr);
+						printf("DMA Mode Disabled\r\n");
+						break;
+					case 1:
+						XNandPsu_EnableDmaMode(NandInstPtr);
+						printf("DMA Mode Enabled\r\n");
+						break;
+					default:
+						printf("Invalid selection\r\n");
+				}
+				break;
+			case MENU_UTIL_OOB_MODE:
+				printf("0. Enable OOB Mode\r\n"
+						"1. Disable OOB Mode\r\n");
+				/* wait for input */
+				*CmdLine = '\n';
+				while(*CmdLine == '\n') {
+					printf("Enter selection: ");
+					GetUserInput(0, CmdLine, 131);
+				}
+				switch(atoi(CmdLine)) {
+					case XNANDPSU_BBT_OOB:
+						XNandPsu_EnableBbtOobMode(NandInstPtr);
+						printf("OOB Mode selected..Scanning for BBT\r\n");
+						Status = XNandPsu_ScanBbt(NandInstPtr);
+						if(Status != XST_SUCCESS){
+							printf("Scan BBT Failed\r\n");
+						}
+						break;
+					case XNANDPSU_BBT_NO_OOB:
+						XNandPsu_DisableBbtOobMode(NandInstPtr);
+						printf("NO OOB Mode selected..Scanning for BBT\r\n");
+						Status = XNandPsu_ScanBbt(NandInstPtr);
+						if(Status != XST_SUCCESS){
+							printf("Scan BBT Failed\r\n");
+						}
+						break;
+					default:
+						printf("Invalid selection\r\n");
+				}
 				break;
 
 			case MENU_UTIL_EXIT:
@@ -754,48 +788,6 @@ static void RunUtilMenu(char* CmdLine)
 	}
 }
 
-/****************************************************************************/
-/**
-*
-* This functions receives a single byte using the UART. It is non-blocking in
-* that it returns if there is no data received.
-*
-* @param	Data will have the received data after this function returns
-*		XST_SUCCESS
-*
-* @return	XST_SUCCESS if received a byte, XST_FAILURE otherwise
-*
-* @note		None.
-*
-******************************************************************************/
-int UART_RecvByte(u8 *Data)
-{
-#ifdef UART16550
-	if (!XUartNs550_IsReceiveData(UART_BASEADDR)) {
-		return XST_FAILURE;
-	} else {
-		*Data = XUartNs550_ReadReg(UART_BASEADDR, XUN_RBR_OFFSET);
-		return XST_SUCCESS;
-	}
-
-#elif UARTLITE
-	if(XUartLite_IsReceiveEmpty(UART_BASEADDR)) {
-		return XST_FAILURE;
-	} else {
-		*Data = (u8)Xil_In32(UART_BASEADDR + XUL_RX_FIFO_OFFSET);
-		return XST_SUCCESS;
-	}
-#else
-	if(!XUartPs_IsReceiveData(UART_BASEADDR)) {
-		return XST_FAILURE;
-	} else {
-		*Data = (u8)XUartPs_ReadReg(UART_BASEADDR,
-				XUARTPS_FIFO_OFFSET);
-		return XST_SUCCESS;
-	}
-#endif
-	return XST_SUCCESS;
-}
 
 /****************************************************************************/
 /**
@@ -838,97 +830,6 @@ Out:
 
 }
 
-/*****************************************************************************/
-/**
-*
-* This function changes the data interface and timing mode.
-*
-* @param	NandInstPtr is a pointer to the XNandPsu instance.
-* @param	NewIntf is the new data interface.
-* @param	NewMode is the new timing mode.
-*
-* @return
-*		- XST_SUCCESS if successful.
-*		- XST_FAILURE if failed.
-*
-* @note		None
-*
-******************************************************************************/
-static int ChangeTimingMode(XNandPsu *NandInstPtr,
-				XNandPsu_DataInterface NewIntf,
-				XNandPsu_TimingMode NewMode){
-
-	s32 Status = XST_FAILURE;
-	u32 t_mode = NewMode;
-	u32 RegVal = 0U;
-	u32 feature = 0U;
-	u32 ddr_mode[2] = {0U};
-
-	if (NewIntf == SDR){
-		NandInstPtr->DataInterface = SDR;
-
-		/*
-		 * Set Timing mode
-		 */
-		Status = XNandPsu_SetFeature(NandInstPtr, 0, 0x1, &t_mode);
-		if (Status != XST_SUCCESS) {
-			goto Out;
-		}
-
-		/*
-		 * Setting Interface and Timing Mode
-		 */
-		NandInstPtr->TimingMode = t_mode;
-	}
-	else{
-		NandInstPtr->DataInterface = NVDDR;
-		ddr_mode[0] = t_mode | 0x10;
-
-		/*
-		 * Set Timing mode
-		 */
-		Status = XNandPsu_SetFeature(NandInstPtr, 0, 0x1, &ddr_mode[0]);
-		if (Status != XST_SUCCESS) {
-			goto Out;
-		}
-
-		/*
-		 * Setting Interface and Timing Mode
-		 */
-		NandInstPtr->TimingMode = ddr_mode[0];
-	}
-
-	/*
-	 * Setting the Data Interface Register
-	 */
-	RegVal = ((NewMode % 6U) << ((NewIntf == NVDDR) ? 3U : 0U)) |
-			((u32)NewIntf << XNANDPSU_DATA_INTF_DATA_INTF_SHIFT);
-	XNandPsu_WriteReg(NandInstPtr->Config.BaseAddress,
-				XNANDPSU_DATA_INTF_OFFSET, RegVal);
-	/*
-	 * Get the Timing mode
-	 */
-	Status = XNandPsu_GetFeature(NandInstPtr, 0, 0x1, &feature);
-	if (Status != XST_SUCCESS) {
-		goto Out;
-	}
-	xil_printf("\tCurrent Interface type : %d, Timing mode is "
-			"%d\r\n\n",NandInstPtr->DataInterface,t_mode);
-
-	/*
-	 * Check if set_feature was successful
-	 */
-	if (feature != NandInstPtr->TimingMode) {
-		xil_printf("Interface / Mode Changed failed %x = %x\r\n",
-				feature,NandInstPtr->TimingMode);
-		Status = XST_FAILURE;
-		goto Out;
-	}
-
-Out:
-	return Status;
-}
-
 /*****************************************************************************/
 /**
  *
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.h b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.h
old mode 100644
new mode 100755
index 2fe049df..bd914252
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.h
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg.h
@@ -41,21 +41,17 @@
 /*****************************************************************************/
 /**
 *
-* @file intg.h - defines integration test API for the can driver
+* @file intg.h - defines integration test API for the nandpsu driver
+*
+* @note		None
 *
-* @note
-* TEST_METHOD has to be defined whether you want
-*	- internal loopback (TEST_LOOPBACK) or
-*	- receive/send data from/to (TEST_EXTERNAL_CAN_ANALYSER) an
-*	  external Can Analyser.
 * <pre>
 *
 * MODIFICATION HISTORY:
 *
 * Ver   Who    Date	 Changes
 * ----- -----  -------- -----------------------------------------------
-* 1.00a xd/sv  01/12/09 First release
-* 1.01  kvn	   26/03/14 First release for xilinx.
+* 1.0   sb    11/28/14 First release.
 *
 * </pre>
 *
@@ -66,7 +62,7 @@
 /***************************** Include Files ********************************/
 
 #include "xparameters.h"
-#include "xnandps8.h"
+#include "xnandpsu.h"
 #include "xscugic.h"
 #include "xstatus.h"
 #include <stdio.h>
@@ -91,7 +87,7 @@
 /*@}*/
 #define NAND_DEVICE_ID		0U
 #define TEST_BUF_SIZE		0x4000U
-#define TEST_PAGE_START		0x2U
+#define TEST_PAGE_START		0x0U
 #define TEST_BLOCK_START	0x1U
 
 /*
@@ -116,9 +112,9 @@ extern u8 WriteBuffer[];	/**< write buffer */
 
 /************************** Variable Definitions ****************************/
 
-/**< XNandPsu instance used throughout tests */
+/**< XNandPs instance used throughout tests */
 extern XNandPsu* NandInstPtr;
-s32 MismatchCounter;
+extern s32 MismatchCounter;
 /************************** Function Prototypes *****************************/
 
 /*
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_bbt_test.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_bbt_test.c
index 6771e09f..a9873bf6 100755
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_bbt_test.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_bbt_test.c
@@ -140,10 +140,6 @@ s32 Bbt_Test(XNandPsu * NandInstPtr)
 	 * Scanning for Bbt
 	 */
 	Status = XNandPsu_ScanBbt(NandInstPtr);
-	if(Status != XST_SUCCESS) {
-		xil_printf("Bad Block table not found "
-				"New Bbt created\r\n");
-	}
 
-	return XST_SUCCESS;
+	return Status;
 }
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_ecc_test.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_ecc_test.c
old mode 100644
new mode 100755
index f8a51ff1..e4bbd5e9
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_ecc_test.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_ecc_test.c
@@ -118,12 +118,12 @@ int Intg_EccTest(XNandPsu * NandInstPtr, int TestLoops)
 * This function runs a test on the NAND flash device using the basic driver
 * functions in polled mode.
 * The function does the following tasks:
-*	- Erase the flash.
-*	- Write data to the flash.
-*	- Read back the data from the flash.
+*	- Erase the block.
+*	- Write data to the page.
+*	- Read back the data from the page.
 *	- Compare the data read against the data Written.
-*	- Corrupt data by writing random data to flash
-*	- Read back the data from the flash.
+*	- Corrupt data by writing random data to page
+*	- Read back the data from the page.
 *	- Compare the data read against the data Written before corruption.
 *
 * @param	NandInstPtr - Instance to the nand driver.
@@ -141,12 +141,20 @@ s32 Ecc_Test(XNandPsu * NandInstPtr)
 	s32 Status = XST_FAILURE;
 	u32 Index;
 	u64 Offset;
+	u32 SpareOffset,ReadSpareOffset,WriteSpareOffset;
 	u32 Length;
-	s32 i;
+	s32 i,j;
 	MismatchCounter = 0;
-	NandInstPtr->BCH_Error_Status = 0;
+	u8 SpareBuffer[TEST_BUF_SIZE];
+	u32 BlockSize = NandInstPtr->Geometry.BlockSize;
+	NandInstPtr->Ecc_Stats_total_flips = 0;
 
 	Offset = (u64)(TEST_PAGE_START * NandInstPtr->Geometry.BytesPerPage);
+	/*
+	 * Offset to write in spare area
+	 */
+	SpareOffset = TEST_PAGE_START;
+
 	Length = NandInstPtr->Geometry.BytesPerPage;
 
 	/*
@@ -156,81 +164,87 @@ s32 Ecc_Test(XNandPsu * NandInstPtr)
 		WriteBuffer[Index] = (u8)0;
 	}
 
+	/*
+	 * Erase the Block
+	 */
+	Status = XNandPsu_Erase(NandInstPtr, (u64)Offset, (u64)BlockSize);
+	if (Status != XST_SUCCESS) {
+		goto Out;
+	}
+
 	/*
 	 * Enable ECC
 	 */
 	XNandPsu_EnableEccMode(NandInstPtr);
 
 	/*
-	 * Erase the flash
+	 * Write first 30 pages of the block.
 	 */
-	Status = XNandPsu_Erase(NandInstPtr, (u64)Offset, (u64)Length);
-	if (Status != XST_SUCCESS) {
-		goto Out;
-	}
-
-	/*
-	 * Write to flash
-	 */
-	Status = XNandPsu_Write(NandInstPtr, (u64)Offset, (u64)Length,
-						&WriteBuffer[0]);
-	if (Status != XST_SUCCESS) {
-		goto Out;
-	}
-
-	/*
-	 * Read the flash after writing
-	 */
-	Status = XNandPsu_Read(NandInstPtr, (u64)Offset, (u64)Length,
-						&ReadBuffer[0]);
-	if (Status != XST_SUCCESS) {
-		goto Out;
-	}
-
-	/*
-	 * Compare the results
-	 */
-	for (Index = 0U; Index < Length;Index++) {
-		if (ReadBuffer[Index] != WriteBuffer[Index]) {
-			MismatchCounter++;
-			Status = XST_FAILURE;
-		}
-	}
-
-	for (i = 0 ; i<24 ; i++){
-		/*
-		 * Disable ECC
-		 */
-		XNandPsu_DisableEccMode(NandInstPtr);
-
-		/*
-		 * Corrupting data in Write buffer
-		 */
-		WriteBuffer[i] = (u8)(i+1);
-
+	for(i = 0 ; i < 24 ; i++){
 		/*
 		 * Write to flash
 		 */
 		Status = XNandPsu_Write(NandInstPtr, (u64)Offset, (u64)Length,
-						&WriteBuffer[0]);
+				&WriteBuffer[0]);
+		if (Status != XST_SUCCESS) {
+			goto Out;
+		}
+
+		Offset = Offset + NandInstPtr->Geometry.BytesPerPage;
+	}
+
+	ReadSpareOffset = SpareOffset;
+	WriteSpareOffset = Offset/(NandInstPtr->Geometry.BytesPerPage);
+
+	for(i = 0 ; i < 24 ; i++){
+		/*
+		 * Read the Spare Area
+		 */
+		Status = XNandPsu_ReadSpareBytes(NandInstPtr, ReadSpareOffset,
+						&SpareBuffer[0]);
 		if (Status != XST_SUCCESS) {
 			goto Out;
 		}
 
 		/*
-		 * Correcting back data in Write buffer
+		 * Disable the ecc mode
 		 */
-		WriteBuffer[i] = (u8)0;
+		XNandPsu_DisableEccMode(NandInstPtr);
+
 
 		/*
-		 * Enable ECC check
+		 * Corrupting the data in write buffer.
+		 */
+		for(j = 0; j<= i ; j++){
+			WriteBuffer[j] = (u8)1;
+		}
+
+		Status = XNandPsu_Write(NandInstPtr, Offset, Length, &WriteBuffer[0]);
+		if(Status != XST_SUCCESS){
+			goto Out;
+		}
+
+		/*
+		 * Write the Ecc Data into the spare area of next page.
+		 */
+		Status = XNandPsu_WriteSpareBytes(NandInstPtr, WriteSpareOffset,
+						&SpareBuffer[0]);
+		if (Status != XST_SUCCESS) {
+			goto Out;
+		}
+
+		for(j = 0; j<= i ; j++){
+			WriteBuffer[j] = (u8)0;
+		}
+		/*
+		 * Enable Ecc Mode
 		 */
 		XNandPsu_EnableEccMode(NandInstPtr);
 
 		/*
-		 * Read the flash after writing
+		 * Read the page after writing
 		 */
-		Status = XNandPsu_Read(NandInstPtr, (u64)Offset, (u64)Length,
+		Status = XNandPsu_Read(NandInstPtr, Offset, Length,
 						&ReadBuffer[0]);
 		if (Status != XST_SUCCESS) {
 			goto Out;
@@ -244,10 +258,14 @@ s32 Ecc_Test(XNandPsu * NandInstPtr)
 				MismatchCounter++;
 				Status = XST_FAILURE;
 			}
-		}
-	}
-	xil_printf("Total BCH ECC errors = %d\r\n",NandInstPtr->BCH_Error_Status);
 
+		}
+		ReadSpareOffset++;
+		WriteSpareOffset++;
+		Offset = Offset + NandInstPtr->Geometry.BytesPerPage;
+	}
+	xil_printf("Total Ecc Error Flips = %d\r\n",
+				NandInstPtr->Ecc_Stats_total_flips);
 Out:
 	return Status;
 }
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_erase_read.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_erase_read.c
old mode 100644
new mode 100755
index e28520b6..d72af841
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_erase_read.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_erase_read.c
@@ -118,8 +118,8 @@ int Intg_EraseReadTest(XNandPsu * NandInstPtr, int TestLoops)
 * This function runs a test on the NAND flash device using the basic driver
 * functions in polled mode.
 * The function does the following tasks:
-*	- Erase the flash.
-*	- Read back the data from the flash.
+*	- Erase the block.
+*	- Read back the data from the block.
 *	- Compare the data read against 0xFF.
 *
 * @param	NandInstPtr - Instance to the nand driver.
@@ -160,7 +160,7 @@ s32 Erase_Read_Test(XNandPsu * NandInstPtr)
 		XNandPsu_DisableEccMode(NandInstPtr);
 
 		/*
-		 * Read the flash after writing
+		 * Read the block.
 		 */
 		Status = XNandPsu_Read(NandInstPtr, (u64)Offset, (u64)Length,
 						&ReadBuffer[0]);
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_flash_rw.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_flash_rw.c
old mode 100644
new mode 100755
index 3a200aa4..0798f018
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_flash_rw.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_flash_rw.c
@@ -120,9 +120,9 @@ int Intg_FlashRWTest(XNandPsu * NandInstPtr, int TestLoops)
 * functions in polled mode.
 * The function does the following tasks:
 *	- Initialize the driver.
-*	- Erase the flash.
-*	- Write data to the flash.
-*	- Read back the data from the flash.
+*	- Erase the block.
+*	- Write data to the page.
+*	- Read back the data from the page.
 *	- Compare the data read against the data Written.
 *
 * @param	NandInstPtr - Instance to the nand driver.
@@ -159,6 +159,7 @@ s32 Flash_RW_Test(XNandPsu * NandInstPtr)
 	if (Status != XST_SUCCESS) {
 		goto Out;
 	}
+
 	/*
 	 * Write to page offset
 	 */
@@ -167,6 +168,7 @@ s32 Flash_RW_Test(XNandPsu * NandInstPtr)
 	if (Status != XST_SUCCESS) {
 		goto Out;
 	}
+
 	/*
 	 * Read from the page after writing
 	 */
@@ -175,6 +177,7 @@ s32 Flash_RW_Test(XNandPsu * NandInstPtr)
 	if (Status != XST_SUCCESS) {
 		goto Out;
 	}
+
 	/*
 	 * Compare the results
 	 */
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_markblockbad_test.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_markblockbad_test.c
index 8e7e9a02..2be8a525 100755
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_markblockbad_test.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_markblockbad_test.c
@@ -41,7 +41,7 @@
 /*****************************************************************************/
 /**
 *
-* @file intg_markblockbad_test.c
+* @file intg_flash_rw.c
 *
 * This file contains the design example for using NAND driver (XNandPsu).
 * This example tests the erase, read and write feature of the controller.
@@ -120,10 +120,10 @@ int Intg_MarkBlockBadTest(XNandPsu * NandInstPtr, int TestLoops)
 * functions in polled mode.
 * The function does the following tasks:
 *   - Marks Blocks bad.
-*   - Erase the blocks.
-*   - Write data to the blocks.
-*   - Read back the data from the blocks.
-*   - Compare the data read against the data Written.
+*	- Erase the blocks.
+*	- Write data to the blocks.
+*	- Read back the data from the blocks.
+*	- Compare the data read against the data Written.
 *
 * @param	NandInstPtr - Instance to the nand driver.
 *
@@ -176,7 +176,6 @@ s32 Mark_BlockBad_Test(XNandPsu * NandInstPtr)
 
 		BlockOff = BlockNo * BlockSize;
 
-		xil_printf("Erasing Block = %d \r\n", BlockNo);
 		/*
 		 * Erase the Block 1,2,3
 		 */
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_partialpage_rw.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_partialpage_rw.c
old mode 100644
new mode 100755
index adfa116f..4b02d1eb
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_partialpage_rw.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_partialpage_rw.c
@@ -120,9 +120,9 @@ int Intg_PartialRWTest(XNandPsu * NandInstPtr, int TestLoops)
 * functions in polled mode.
 * The function does the following tasks:
 *   - Choose random page size for read write Operations.
-*	- Erase the flash.
-*	- Write data to the flash.
-*	- Read back the data from the flash.
+*	- Erase the block.
+*	- Write data to the page.
+*	- Read back the data from the page.
 *	- Compare the data read against the data Written.
 *
 * @param	NandInstPtr - Instance to the nand driver.
@@ -151,6 +151,9 @@ s32 PartialPage_RW_Test(XNandPsu * NandInstPtr)
 	 */
 	for(i = 0; i< 5; i++){
 
+		/*
+		 * Select Random Length of data to be written to the page.
+		 */
 		Length = rand()%NandInstPtr->Geometry.BytesPerPage;
 		if(Length == 0U){
 			Length = NandInstPtr->Geometry.BytesPerPage;
@@ -172,7 +175,7 @@ s32 PartialPage_RW_Test(XNandPsu * NandInstPtr)
 		}
 
 		/*
-		 * Write to flash
+		 * Write to page
 		 */
 		Status = XNandPsu_Write(NandInstPtr, (u64)Offset, (u64)Length,
 						&WriteBuffer[0]);
@@ -181,7 +184,7 @@ s32 PartialPage_RW_Test(XNandPsu * NandInstPtr)
 		}
 
 		/*
-		 * Read the flash after writing
+		 * Read the page after writing
 		 */
 		Status = XNandPsu_Read(NandInstPtr, (u64)Offset, (u64)Length,
 						&ReadBuffer[0]);
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_random_rw.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_random_rw.c
old mode 100644
new mode 100755
index 7bf43bac..0cb92fc6
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_random_rw.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_random_rw.c
@@ -120,9 +120,9 @@ int Intg_RandomRWTest(XNandPsu * NandInstPtr, int TestLoops)
 * functions in polled mode.
 * The function does the following tasks:
 *	- Initialize the driver.
-*	- Erase the flash.
-*	- Write data to the flash.
-*	- Read back the data from the flash.
+*	- Erase the block.
+*	- Write data to the pages of block.
+*	- Read back the data from the pages of block.
 *	- Compare the data read against the data Written.
 *
 * @param	NandInstPtr - Instance to the nand driver.
@@ -172,7 +172,7 @@ s32 Random_Block_RW_Test(XNandPsu * NandInstPtr)
 		}
 
 		/*
-		 * Write to flash
+		 * Write to page
 		 */
 		Status = XNandPsu_Write(NandInstPtr, (u64)Offset, (u64)Length,
 				&WriteBuffer[0]);
@@ -181,7 +181,7 @@ s32 Random_Block_RW_Test(XNandPsu * NandInstPtr)
 		}
 
 		/*
-		 * Read the flash after writing
+		 * Read the page after writing
 		 */
 		Status = XNandPsu_Read(NandInstPtr, (u64)Offset, (u64)Length,
 						&ReadBuffer[0]);
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_sparebytes_rw.c b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_sparebytes_rw.c
old mode 100644
new mode 100755
index 27d8a9ad..ffda8fe4
--- a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_sparebytes_rw.c
+++ b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/intg_sparebytes_rw.c
@@ -117,9 +117,9 @@ int Intg_SpareBytesRWTest(XNandPsu * NandInstPtr, int TestLoops)
 * This function runs a test on the NAND flash device using the basic driver
 * functions in polled mode.
 * The function does the following tasks:
-*	- Erase the flash.
-*	- Write data to the spare byte section of flash.
-*	- Read back the data from the spare byte section of flash.
+*	- Erase the Block.
+*	- Write data to the spare byte section of page.
+*	- Read back the data from the spare byte section of page.
 *	- Compare the data read against the data Written.
 *
 * @param	NandInstPtr - Instance to the nand driver.
@@ -148,7 +148,7 @@ s32 SpareBytes_RW_Test(XNandPsu * NandInstPtr)
 	/*
 	 * Offset to write in spare area
 	 */
-	SpareOffset = (u64)(TEST_PAGE_START);
+	SpareOffset = TEST_PAGE_START;
 
 	/*
 	 * Repeat the test for 5 iterations
@@ -156,16 +156,19 @@ s32 SpareBytes_RW_Test(XNandPsu * NandInstPtr)
 	for(i = 0; i< 5; i++){
 
 		/*
-		 * Erase the flash
+		 * Erase the Block
 		 */
 		Status = XNandPsu_Erase(NandInstPtr, (u64)Offset, (u64)Length);
 		if (Status != XST_SUCCESS) {
 			goto Out;
 		}
 
+		/*
+		 * Select Random Length of data to be written in Spare Region.
+		 */
 		Length = rand() % (NandInstPtr->Geometry.SpareBytesPerPage);
 		if(Length == 0U){
-			Length = NandInstPtr->Geometry.SpareBytesPerPage;
+			Length = (NandInstPtr->Geometry.SpareBytesPerPage);
 		}
 
 		/*
@@ -181,7 +184,7 @@ s32 SpareBytes_RW_Test(XNandPsu * NandInstPtr)
 		XNandPsu_DisableEccMode(NandInstPtr);
 
 		/*
-		 * Write to flash Spare Bytes Section
+		 * Write to Spare Bytes Section of page.
 		 */
 		Status = XNandPsu_WriteSpareBytes(NandInstPtr, SpareOffset,
 				&WriteBuffer[0]);
@@ -190,7 +193,7 @@ s32 SpareBytes_RW_Test(XNandPsu * NandInstPtr)
 		}
 
 		/*
-		 * Read from the flash Spare Bytes after writing
+		 * Read from the Spare Bytes after writing
 		 */
 		Status = XNandPsu_ReadSpareBytes(NandInstPtr, SpareOffset,
 				&ReadBuffer[0]);
diff --git a/XilinxProcessorIPLib/drivers/nandpsu/intgTest/xil_testlib.h b/XilinxProcessorIPLib/drivers/nandpsu/intgTest/xil_testlib.h
old mode 100644
new mode 100755