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 237fe4427d0eaeae15417e1722ac07a95ea28954..e9cceda7a9675ef01cb6ff202c65d4966875220d 100644 (file)
--- 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 5529daa9ef06c3c28173f50ffd4bc76f0c410c5d..a85352beb9342666c73986327e4ddff0d8795710 100644 (file)
--- 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 4b6ba99862101821efb6c3e447c986e4acd817d4..441e6e235694998de6938db60bcb4fb7e042de5e 100755 (executable)
--- 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 013c13b2f0c82306e4082ecc60316981dc1d4aab..5d4bd769a295c6ade8acf68b9ceaf1ad9f42ac2f 100755 (executable)
--- 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 c28630b1110f4d86bb120c1713b54cb3a80a0cba..08e2de4db7c66084187441c5fe46dc02da0cc440 100644 (file)
--- 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 df561a95a45bea3961892e53939c37e64fdac39a..f3ab32168b492855facb91685f2a1909650c96c4 100644 (file)
--- 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 ede05535b3011636f8c2b17b789c1acc9babfe66..dd05508171633d26aa3aa6e822e7ab579b5b23f6 100644 (file)
--- 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 9f61034c2ab94bdf09e0c6cde86c9c0c29985d9a..c7b40c70efa386510e3f19872b88f47d923f05d8 100644 (file)
--- 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 774e441870f21ed8599347d19de4c0972167f000..2d4851e591e568cda7443fac2f132398042bdbf4 100644 (file)
--- 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 e585658817615fde9eda1a373c5c357d4f04d51b..fe68342efb480c2ba4513a9b29376da49c12ee6f 100644 (file)
--- 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