Merge commit 'wd/master'

4 files changed, 15 insertions, 15 deletions

diff --git a/board/xilinx/common/xdma_channel.c b/board/xilinx/common/xdma_channel.c
index 3d5fc75..f816138 100644
--- a/board/xilinx/common/xdma_channel.c
+++ b/board/xilinx/common/xdma_channel.c
@@ -226,7 +226,7 @@ XDmaChannel_GetVersion(XDmaChannel * InstancePtr)
 * XST_SUCCESS is returned if the self test is successful, or one of the
 * following errors.
 *
-*	XST_DMA_RESET_REGISTER_ERROR 		Indicates the control register value
+*	XST_DMA_RESET_REGISTER_ERROR		Indicates the control register value
 *										after a reset was not correct
 *
 * NOTES:
@@ -475,7 +475,7 @@ XDmaChannel_GetStatus(XDmaChannel * InstancePtr)
 *	XDC_IXR_DMA_DONE_MASK		The dma operation is done
 *	XDC_IXR_DMA_ERROR_MASK	    The dma operation had an error
 *	XDC_IXR_PKT_DONE_MASK	    A packet is complete
-*	XDC_IXR_PKT_THRESHOLD_MASK 	The packet count threshold reached
+*	XDC_IXR_PKT_THRESHOLD_MASK	The packet count threshold reached
 *	XDC_IXR_PKT_WAIT_BOUND_MASK The packet wait bound reached
 *	XDC_IXR_SG_DISABLE_ACK_MASK The scatter gather disable completed
 *	XDC_IXR_BD_MASK				A buffer descriptor is done
@@ -533,7 +533,7 @@ XDmaChannel_SetIntrStatus(XDmaChannel * InstancePtr, u32 Status)
 *	XDC_IXR_DMA_DONE_MASK		The dma operation is done
 *	XDC_IXR_DMA_ERROR_MASK	    The dma operation had an error
 *	XDC_IXR_PKT_DONE_MASK	    A packet is complete
-*	XDC_IXR_PKT_THRESHOLD_MASK 	The packet count threshold reached
+*	XDC_IXR_PKT_THRESHOLD_MASK	The packet count threshold reached
 *	XDC_IXR_PKT_WAIT_BOUND_MASK The packet wait bound reached
 *	XDC_IXR_SG_DISABLE_ACK_MASK The scatter gather disable completed
 *	XDC_IXR_SG_END_MASK			Current descriptor was the end of the list
@@ -584,7 +584,7 @@ XDmaChannel_GetIntrStatus(XDmaChannel * InstancePtr)
 *	XDC_IXR_DMA_DONE_MASK		The dma operation is done
 *	XDC_IXR_DMA_ERROR_MASK	    The dma operation had an error
 *	XDC_IXR_PKT_DONE_MASK	    A packet is complete
-*	XDC_IXR_PKT_THRESHOLD_MASK 	The packet count threshold reached
+*	XDC_IXR_PKT_THRESHOLD_MASK	The packet count threshold reached
 *	XDC_IXR_PKT_WAIT_BOUND_MASK The packet wait bound reached
 *	XDC_IXR_SG_DISABLE_ACK_MASK The scatter gather disable completed
 *	XDC_IXR_SG_END_MASK			Current descriptor was the end of the list
@@ -638,7 +638,7 @@ XDmaChannel_SetIntrEnable(XDmaChannel * InstancePtr, u32 Enable)
 *	XDC_IXR_DMA_DONE_MASK		The dma operation is done
 *	XDC_IXR_DMA_ERROR_MASK	    The dma operation had an error
 *	XDC_IXR_PKT_DONE_MASK	    A packet is complete
-*	XDC_IXR_PKT_THRESHOLD_MASK 	The packet count threshold reached
+*	XDC_IXR_PKT_THRESHOLD_MASK	The packet count threshold reached
 *	XDC_IXR_PKT_WAIT_BOUND_MASK The packet wait bound reached
 *	XDC_IXR_SG_DISABLE_ACK_MASK The scatter gather disable completed
 *	XDC_IXR_BD_MASK				A buffer descriptor is done
diff --git a/board/xilinx/common/xdma_channel.h b/board/xilinx/common/xdma_channel.h
index 06976c3..4685982 100644
--- a/board/xilinx/common/xdma_channel.h
+++ b/board/xilinx/common/xdma_channel.h
@@ -96,7 +96,7 @@
 * 1. Create a scatter gather list for the DMA channel which puts empty buffer
 *    descriptors into the list.
 * 2. Create buffer descriptors which describe the buffers to be filled with
-* 	 receive data or the buffers which contain data to be sent.
+*	 receive data or the buffers which contain data to be sent.
 * 3. Put buffer descriptors into the DMA channel scatter list such that scatter
 *    gather operations are requested.
 * 4. Commit the buffer descriptors in the list such that they are ready to be
@@ -208,7 +208,7 @@
 #define XDC_IXR_DMA_DONE_MASK		0x1UL	/* dma operation done */
 #define XDC_IXR_DMA_ERROR_MASK	    0x2UL	/* dma operation error */
 #define XDC_IXR_PKT_DONE_MASK	    0x4UL	/* packet done */
-#define XDC_IXR_PKT_THRESHOLD_MASK 	0x8UL	/* packet count threshold */
+#define XDC_IXR_PKT_THRESHOLD_MASK	0x8UL	/* packet count threshold */
 #define XDC_IXR_PKT_WAIT_BOUND_MASK 0x10UL	/* packet wait bound reached */
 #define XDC_IXR_SG_DISABLE_ACK_MASK 0x20UL	/* scatter gather disable
 						   acknowledge occurred */
diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds
index 815d81d..2d32225 100644
--- a/board/xilinx/ml300/u-boot.lds
+++ b/board/xilinx/ml300/u-boot.lds
@@ -34,11 +34,11 @@ SECTIONS
   .dynsym        : { *(.dynsym)		}
   .dynstr        : { *(.dynstr)		}
   .rel.text      : { *(.rel.text)		}
-  .rela.text     : { *(.rela.text) 	}
+  .rela.text     : { *(.rela.text)	}
   .rel.data      : { *(.rel.data)		}
-  .rela.data     : { *(.rela.data) 	}
-  .rel.rodata    : { *(.rel.rodata) 	}
-  .rela.rodata   : { *(.rela.rodata) 	}
+  .rela.data     : { *(.rela.data)	}
+  .rel.rodata    : { *(.rel.rodata)	}
+  .rela.rodata   : { *(.rela.rodata)	}
   .rel.got       : { *(.rel.got)		}
   .rela.got      : { *(.rela.got)		}
   .rel.ctors     : { *(.rel.ctors)	}
diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug
index 88dcaf9..0552994 100644
--- a/board/xilinx/ml300/u-boot.lds.debug
+++ b/board/xilinx/ml300/u-boot.lds.debug
@@ -33,11 +33,11 @@ SECTIONS
   .dynsym        : { *(.dynsym)		}
   .dynstr        : { *(.dynstr)		}
   .rel.text      : { *(.rel.text)		}
-  .rela.text     : { *(.rela.text) 	}
+  .rela.text     : { *(.rela.text)	}
   .rel.data      : { *(.rel.data)		}
-  .rela.data     : { *(.rela.data) 	}
-  .rel.rodata    : { *(.rel.rodata) 	}
-  .rela.rodata   : { *(.rela.rodata) 	}
+  .rela.data     : { *(.rela.data)	}
+  .rel.rodata    : { *(.rel.rodata)	}
+  .rela.rodata   : { *(.rela.rodata)	}
   .rel.got       : { *(.rel.got)		}
   .rela.got      : { *(.rela.got)		}
   .rel.ctors     : { *(.rel.ctors)	}