Xilinx: ARM: Removed some duplicate functions on board

Few functions having same definitions but different names are
removed. These might have been added during initial support of u-boot.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

diff --git a/board/xilinx/zynq_common/board.c b/board/xilinx/zynq_common/board.c
index 64a284edf96e76dbbce54475e9a2c2404def12bb..06cf13135094cca8330f5c692c7f5dcd6667ec41 100644 (file)
--- a/board/xilinx/zynq_common/board.c
+++ b/board/xilinx/zynq_common/board.c
@@ -18,21 +18,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define dmb() __asm__ __volatile__ ("dmb" : : : "memory")
-
-static void Out32(u32 OutAddress, u32 Value)
-{
-    *(volatile u32 *) OutAddress = Value;
-    dmb();
-}
-
-static u32 In32(u32 InAddress)
-{
-    volatile u32 temp = *(volatile u32 *)InAddress;
-    dmb();
-    return temp;
-}
-
 /* Common IO for xgmac and xnand */
 /* Data Memory Barrier */
 #define dmb() __asm__ __volatile__ ("dmb" : : : "memory")
@@ -51,8 +36,8 @@ u32 XIo_In32(u32 InAddress)
        return temp;
 }
 
-#define Xil_Out32 Out32
-#define Xil_In32 In32
+#define Xil_Out32
+#define Xil_In32
 
 #ifdef CONFIG_FPGA
 Xilinx_desc fpga = XILINX_XC7Z020_DESC(0);
@@ -88,7 +73,7 @@ int board_late_init (void)
 {
        u32 boot_mode;
 
-       boot_mode = (In32(BOOT_MODE_REG) & BOOT_MODES_MASK);
+       boot_mode = (Xil_In32(BOOT_MODE_REG) & BOOT_MODES_MASK);
        switch(boot_mode) {
        case QSPI_MODE:
                setenv("modeboot", "run qspiboot");

diff --git a/include/linux/string.h b/include/linux/string.h
index c469df7bf397dcf974e56041950fe4d958a073c2..9a8cbc24cdceeef5612dcdeca82fe788b3d33f56 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -54,7 +54,6 @@ extern char *strim(char *);
 #ifndef __HAVE_ARCH_STRSTR
 extern char * strstr(const char *,const char *);
 #endif
-extern char *strim(char *s);
 #ifndef __HAVE_ARCH_STRLEN
 extern __kernel_size_t strlen(const char *);
 #endif