LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zynq: Move scutimer baseaddr to hardware.h 

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>
This commit is contained in:
Michal Simek 2013-04-12 16:21:26 +02:00
parent e072b5f5dc
commit 4b21284b8c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/cpu/armv7/zynq/timer.c
View File

@ -44,6 +44,7 @@
#include <common.h> #include <common.h>
#include <div64.h> #include <div64.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/hardware.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -54,7 +55,7 @@ struct scu_timer {
}; };
static struct scu_timer *timer_base = 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_MASK 0x0000FF00 /* Prescaler */
#define SCUTIMER_CONTROL_PRESCALER_SHIFT 8 #define SCUTIMER_CONTROL_PRESCALER_SHIFT 8

1
arch/arm/include/asm/arch-zynq/hardware.h
View File

@ -26,6 +26,7 @@
#define ZYNQ_SYS_CTRL_BASEADDR 0xF8000000 #define ZYNQ_SYS_CTRL_BASEADDR 0xF8000000
#define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000 #define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000
#define ZYNQ_SCU_BASEADDR 0xF8F00000 #define ZYNQ_SCU_BASEADDR 0xF8F00000
#define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600
/* Reflect slcr offsets */ /* Reflect slcr offsets */
struct slcr_regs { struct slcr_regs {

3
include/configs/zynq.h
View File

@ -50,9 +50,6 @@
#define CONFIG_ZYNQ_SERIAL_BAUDRATE0 CONFIG_BAUDRATE #define CONFIG_ZYNQ_SERIAL_BAUDRATE0 CONFIG_BAUDRATE
#define CONFIG_ZYNQ_SERIAL_CLOCK0 50000000 #define CONFIG_ZYNQ_SERIAL_CLOCK0 50000000
/* SCU timer address is hardcoded */
#define CONFIG_SCUTIMER_BASEADDR 0xF8F00600
/* Ethernet driver */ /* Ethernet driver */
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_ZYNQ_GEM #define CONFIG_ZYNQ_GEM