diff --git a/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_interrupt_example.c b/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_interrupt_example.c
index 95e5764e..3c06acc2 100644
--- a/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_interrupt_example.c
+++ b/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_interrupt_example.c
@@ -312,8 +312,8 @@ static int QspiPsuSetupIntrSystem(XScuGic *IntcInstancePtr,
 static void QspiPsuDisableIntrSystem(XScuGic *IntcInstancePtr, u16 QspiPsuIntrId);
 void QspiPsuHandler(void *CallBackRef, u32 StatusEvent, unsigned int ByteCount);
 /************************** Variable Definitions *****************************/
-u8 TxBfrPtr __attribute__ ((aligned(64)));
-u8 ReadBfrPtr[4] __attribute__ ((aligned(64)));
+u8 TxBfrPtr;
+u8 ReadBfrPtr[4];
 FlashInfo Flash_Config_Table[24] = {
 		/* Spansion */
 		{0x10000, 0x100, 256, 0x10000, 0x1000000,
@@ -410,8 +410,8 @@ int Test = 1;
  * (overhead+dummy) bytes
  */
 u8 ReadBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + (DATA_OFFSET + DUMMY_SIZE)*8] __attribute__ ((aligned(64)));
-u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET] __attribute__ ((aligned(64)));
-u8 CmdBfr[8] __attribute__ ((aligned(64)));
+u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET];
+u8 CmdBfr[8];
 
 /*
  * The following constants specify the max amount of data and the size of the
@@ -829,10 +829,10 @@ int FlashReadID(XQspiPsu *QspiPsuPtr)
 int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
 				u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
-	u8 WriteCmd[5] __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
+	u8 WriteCmd[5];
 	u32 RealAddr;
 	u32 CmdByteCount;
 	int Status;
@@ -977,9 +977,9 @@ int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
 ******************************************************************************/
 int FlashErase(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
 	int Sector;
 	u32 RealAddr;
 	u32 NumSect;
@@ -1296,9 +1296,9 @@ int FlashRead(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
 ******************************************************************************/
 int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
 	int Status;
 
 	WriteEnableCmd = WRITE_ENABLE_CMD;
@@ -1400,10 +1400,10 @@ int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
 ******************************************************************************/
 int DieErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
 	u8 DieCnt;
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
 	int Status;
 
 	WriteEnableCmd = WRITE_ENABLE_CMD;
diff --git a/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_polled_example.c b/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_polled_example.c
index c2b9f70a..4d20d089 100644
--- a/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_polled_example.c
+++ b/XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_polled_example.c
@@ -308,8 +308,8 @@ int FlashRegisterRead(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command, u8 *ReadB
 int FlashRegisterWrite(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command,
 					u8 *WriteBfrPtr, u8 WrEn);
 /************************** Variable Definitions *****************************/
-u8 TxBfrPtr __attribute__ ((aligned(64)));
-u8 ReadBfrPtr[4] __attribute__ ((aligned(64)));
+u8 TxBfrPtr;
+u8 ReadBfrPtr[4];
 FlashInfo Flash_Config_Table[24] = {
 		/* Spansion */
 		{0x10000, 0x100, 256, 0x10000, 0x1000000,
@@ -393,8 +393,8 @@ int Test = 1;
  * (overhead+dummy) bytes
  */
 u8 ReadBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + (DATA_OFFSET + DUMMY_SIZE)*8] __attribute__ ((aligned(64)));
-u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET] __attribute__ ((aligned(64)));
-u8 CmdBfr[8] __attribute__ ((aligned(64)));
+u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET];
+u8 CmdBfr[8];
 
 /*
  * The following constants specify the max amount of data and the size of the
@@ -762,10 +762,10 @@ int FlashReadID(XQspiPsu *QspiPsuPtr)
 int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
 				u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
-	u8 WriteCmd[5] __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
+	u8 WriteCmd[5];
 	u32 RealAddr;
 	u32 CmdByteCount;
 	int Status;
@@ -901,9 +901,9 @@ int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
 int FlashErase(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount,
 		u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
 	int Sector;
 	u32 RealAddr;
 	u32 NumSect;
@@ -1215,9 +1215,9 @@ int FlashRead(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
 int FlashRegisterWrite(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command,
 					u8 *WriteBfrPtr, u8 WrEn)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
 	int Status;
 
 	if(WrEn) {
@@ -1310,7 +1310,7 @@ int FlashRegisterWrite(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command,
 ******************************************************************************/
 int FlashRegisterRead(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command, u8 *ReadBfrPtr)
 {
-	u8 WriteCmd __attribute__ ((aligned(64)));
+	u8 WriteCmd;
 	int Status;
 
 	WriteCmd = Command;
@@ -1351,9 +1351,9 @@ int FlashRegisterRead(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command, u8 *ReadB
 ******************************************************************************/
 int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
 	int Status;
 
 	WriteEnableCmd = WRITE_ENABLE_CMD;
@@ -1449,10 +1449,10 @@ int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
 ******************************************************************************/
 int DieErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
 {
-	u8 WriteEnableCmd __attribute__ ((aligned(64)));
+	u8 WriteEnableCmd;
 	u8 DieCnt;
-	u8 ReadStatusCmd __attribute__ ((aligned(64)));
-	u8 FlashStatus[4] __attribute__ ((aligned(64)));
+	u8 ReadStatusCmd;
+	u8 FlashStatus[4];
 	int Status;
 
 	WriteEnableCmd = WRITE_ENABLE_CMD;