summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e072b5f)
raw | patch | inline | side by side (parent: e072b5f)
author | Michal Simek <michal.simek@xilinx.com> | |
Fri, 12 Apr 2013 14:21:26 +0000 (16:21 +0200) | ||
committer | Michal Simek <michal.simek@xilinx.com> | |
Tue, 30 Apr 2013 09:39:12 +0000 (11:39 +0200) |
Move baseaddr to hardware.h to be shared between
configurations.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@ti.com>
configurations.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@ti.com>
arch/arm/cpu/armv7/zynq/timer.c | patch | blob | history | |
arch/arm/include/asm/arch-zynq/hardware.h | patch | blob | history | |
include/configs/zynq.h | patch | blob | history |
index 5d8bb24096e7212f71688c84c160cb16be02efbc..8c4357de4202c1b8197b916c575165ed1e84facc 100644 (file)
#include <common.h>
#include <div64.h>
#include <asm/io.h>
+#include <asm/arch/hardware.h>
DECLARE_GLOBAL_DATA_PTR;
};
static struct scu_timer *timer_base =
- (struct scu_timer *) CONFIG_SCUTIMER_BASEADDR;
+ (struct scu_timer *)ZYNQ_SCUTIMER_BASEADDR;
#define SCUTIMER_CONTROL_PRESCALER_MASK 0x0000FF00 /* Prescaler */
#define SCUTIMER_CONTROL_PRESCALER_SHIFT 8
index a99edbeffcc0e6edcf264fe248640bd1a2f43b58..ccbf54e040caef44de9005d67a4f0ef6e79e08ae 100644 (file)
#define ZYNQ_SYS_CTRL_BASEADDR 0xF8000000
#define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000
#define ZYNQ_SCU_BASEADDR 0xF8F00000
+#define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600
/* Reflect slcr offsets */
struct slcr_regs {
diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 2989e723e04c6f5633aa80d978570a553096e06b..11476894d32845e1766ce118750bf451a35c5808 100644 (file)
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
#define CONFIG_ZYNQ_SERIAL_BAUDRATE0 CONFIG_BAUDRATE
#define CONFIG_ZYNQ_SERIAL_CLOCK0 50000000
-/* SCU timer address is hardcoded */
-#define CONFIG_SCUTIMER_BASEADDR 0xF8F00600
-
/* Ethernet driver */
#define CONFIG_NET_MULTI
#define CONFIG_ZYNQ_GEM