]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Xilinx: ARM: Renamed Xil_out32 and Xil_In32 into XIo_Out32 and XIo_In32
authorJagannadha Sutradharudu Teki <jaganna@xilinx.com>
Thu, 16 Aug 2012 13:15:02 +0000 (18:45 +0530)
committerJagannadha Sutradharudu Teki <jaganna@xilinx.com>
Fri, 17 Aug 2012 11:22:08 +0000 (16:52 +0530)
Due to earlier cleanup, the definitions of Xil_Out32 and Xil_In32
macros are removed. So referenced them to current existing definitions.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
board/xilinx/zynq_common/board.c

index 06cf13135094cca8330f5c692c7f5dcd6667ec41..e5a17b4201e1d3f0ba1194496900da84dec67836 100644 (file)
@@ -36,9 +36,6 @@ u32 XIo_In32(u32 InAddress)
        return temp;
 }
 
-#define Xil_Out32
-#define Xil_In32
-
 #ifdef CONFIG_FPGA
 Xilinx_desc fpga = XILINX_XC7Z020_DESC(0);
 #endif
@@ -48,16 +45,16 @@ int board_init(void)
        /* temporary hack to clear pending irqs before Linux as it 
           will hang Linux */
 
-       Xil_Out32(0xe0001014, 0x26d);
+       XIo_Out32(0xe0001014, 0x26d);
 
        /* temporary hack to take USB out of reset til the is fixed
           in Linux */
 
-       Xil_Out32(0xe000a204, 0x80);
-       Xil_Out32(0xe000a208, 0x80);
-       Xil_Out32(0xe000a040, 0x80);
-       Xil_Out32(0xe000a040, 0x00);
-       Xil_Out32(0xe000a040, 0x80);
+       XIo_Out32(0xe000a204, 0x80);
+       XIo_Out32(0xe000a208, 0x80);
+       XIo_Out32(0xe000a040, 0x80);
+       XIo_Out32(0xe000a040, 0x00);
+       XIo_Out32(0xe000a040, 0x80);
 
        icache_enable();
 
@@ -73,7 +70,7 @@ int board_late_init (void)
 {
        u32 boot_mode;
 
-       boot_mode = (Xil_In32(BOOT_MODE_REG) & BOOT_MODES_MASK);
+       boot_mode = (XIo_In32(BOOT_MODE_REG) & BOOT_MODES_MASK);
        switch(boot_mode) {
        case QSPI_MODE:
                setenv("modeboot", "run qspiboot");