From: Joe Hershberger <joe.hershberger@ni.com>
Date: Tue, 5 Jun 2012 02:39:56 +0000 (-0500)
Subject: Xilinx: ARM: Move arch headers to the arch include dir
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96c6cf0b8e0af9131a358be2321b2225688fe629;p=thirdparty%2Fu-boot.git

Xilinx: ARM: Move arch headers to the arch include dir

These need to be accessed from drivers... do it correctly

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/cpu/armv7/zynq/timer.c
index 237fe4427d0..e9cceda7a96 100644
--- a/arch/arm/cpu/armv7/zynq/timer.c
+++ b/arch/arm/cpu/armv7/zynq/timer.c
@@ -39,10 +39,10 @@
  */
 
 #include <common.h>
-#include <asm/proc-armv/ptrace.h>
+#include <asm/proc/ptrace.h>
+#include <asm/arch/xparameters.h>
 #include <div64.h>
 
-#include "xparameters.h"
 #include "xscutimer_hw.h"
 
 #define TIMER_LOAD_VAL 0xFFFFFFFF
diff --git a/board/xilinx/zynq_common/xparameters.h b/arch/arm/include/asm/arch-zynq/xparameters.h
similarity index 100%
rename from board/xilinx/zynq_common/xparameters.h
rename to arch/arm/include/asm/arch-zynq/xparameters.h
diff --git a/board/xilinx/zynq_common/xparameters_ps.h b/arch/arm/include/asm/arch-zynq/xparameters_ps.h
similarity index 100%
rename from board/xilinx/zynq_common/xparameters_ps.h
rename to arch/arm/include/asm/arch-zynq/xparameters_ps.h
diff --git a/board/xilinx/zynq_common/board.c b/board/xilinx/zynq_common/board.c
index 5529daa9ef0..a85352beb93 100644
--- a/board/xilinx/zynq_common/board.c
+++ b/board/xilinx/zynq_common/board.c
@@ -3,11 +3,10 @@
  */
 
 #include <common.h>
+#include <asm/arch/xparameters.h>
 #include <netdev.h>
-#include <xparameters.h>
 #include <zynqpl.h>
 #include "ps7_init_hw.h"
-#include "xparameters.h"
 
 #define PARPORT_CRTL_BASEADDR                   XPSS_CRTL_PARPORT_BASEADDR
 #define NOR_FLASH_BASEADDR                      XPSS_PARPORT0_BASEADDR
diff --git a/board/xilinx/zynq_common/lowlevel_init.S b/board/xilinx/zynq_common/lowlevel_init.S
index 4b6ba998621..441e6e23569 100755
--- a/board/xilinx/zynq_common/lowlevel_init.S
+++ b/board/xilinx/zynq_common/lowlevel_init.S
@@ -5,7 +5,7 @@
  * It needs lots of love and attention some day.
  */
 
-#include <xparameters.h>
+#include <asm/arch/xparameters.h>
 #include <config.h>
 
 
diff --git a/board/xilinx/zynq_common/mmc.c b/board/xilinx/zynq_common/mmc.c
index 013c13b2f0c..5d4bd769a29 100755
--- a/board/xilinx/zynq_common/mmc.c
+++ b/board/xilinx/zynq_common/mmc.c
@@ -1,10 +1,10 @@
 #include <common.h>
+#include <asm/arch/xparameters.h>
 #include <asm/errno.h>
 #include <malloc.h>
 #include <mmc.h>
 
 #include "sd_hardware.h"
-#include "xparameters.h"
 
 #define SD_BASEADDR XPSS_SDIO0_BASEADDR
 
diff --git a/board/xilinx/zynq_common/xemacps.h b/board/xilinx/zynq_common/xemacps.h
index c28630b1110..08e2de4db7c 100644
--- a/board/xilinx/zynq_common/xemacps.h
+++ b/board/xilinx/zynq_common/xemacps.h
@@ -285,12 +285,13 @@ extern "C" {
 
 /***************************** Include Files ********************************/
 
+#include <asm/arch/xparameters.h>
+
 #include "xbasic_types.h"
 #include "xstatus.h"
 #include "xemacps_hw.h"
 #include "xemacps_bd.h"
 #include "xemacps_bdring.h"
-#include "xparameters.h"
 
 /************************** Constant Definitions ****************************/
 
diff --git a/board/xilinx/zynq_common/xemacps_g.c b/board/xilinx/zynq_common/xemacps_g.c
index df561a95a45..f3ab32168b4 100644
--- a/board/xilinx/zynq_common/xemacps_g.c
+++ b/board/xilinx/zynq_common/xemacps_g.c
@@ -65,7 +65,6 @@
 
 /***************************** Include Files *********************************/
 
-//#include "xparameters.h"
 #include "xemacps.h"
 
 /************************** Constant Definitions *****************************/
diff --git a/board/xilinx/zynq_common/xemacps_sinit.c b/board/xilinx/zynq_common/xemacps_sinit.c
index ede05535b30..dd055081716 100644
--- a/board/xilinx/zynq_common/xemacps_sinit.c
+++ b/board/xilinx/zynq_common/xemacps_sinit.c
@@ -58,7 +58,6 @@
 
 /***************************** Include Files *********************************/
 
-//#include "xparameters.h"
 #include "xemacps.h"
 
 /************************** Constant Definitions *****************************/
diff --git a/board/xilinx/zynq_common/xilinx_qspi.c b/board/xilinx/zynq_common/xilinx_qspi.c
index 9f61034c2ab..c7b40c70efa 100644
--- a/board/xilinx/zynq_common/xilinx_qspi.c
+++ b/board/xilinx/zynq_common/xilinx_qspi.c
@@ -10,7 +10,7 @@
 #include <malloc.h>
 #include <spi.h>
 
-#include <xparameters.h>
+#include <asm/arch/xparameters.h>
 
 #include "xilinx_qspips.h"
 
diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 774e441870f..2d4851e591e 100644
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_ZYNQ_COMMON_H
 #define __CONFIG_ZYNQ_COMMON_H
 
-#include "../board/xilinx/zynq_common/xparameters.h"
+#include <asm/arch/xparameters.h>
 
 #define CONFIG_SYS_TEXT_BASE 0x04000000
 
diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index e5856588176..fe68342efb4 100644
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -15,7 +15,7 @@
 #define CONFIG_ARM_DCC  1 /* enable dcc channel */
 #define CONFIG_CPU_V6   1
 
-#include "../board/xilinx/zynq_common/xparameters.h"
+#include <asm/arch/xparameters.h>
 
 /*
  * Open Firmware flat tree