| Message ID | f6d7a57eb41664b4d30d1c0c2bd4379836d2f2a4.1366641836.git.michal.simek@xilinx.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Apr 22, 2013 at 04:52:00PM +0200, Michal Simek wrote: > Move baseaddr to hardware.h to be shared between > configurations. Is this really configurable? If not, lets also rename it to drop CONFIG.
diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/cpu/armv7/zynq/timer.c index 5d8bb24..44a5f4c 100644 --- a/arch/arm/cpu/armv7/zynq/timer.c +++ b/arch/arm/cpu/armv7/zynq/timer.c @@ -44,6 +44,7 @@ #include <common.h> #include <div64.h> #include <asm/io.h> +#include <asm/arch/hardware.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h index d0c69da..1b72773 100644 --- a/arch/arm/include/asm/arch-zynq/hardware.h +++ b/arch/arm/include/asm/arch-zynq/hardware.h @@ -26,6 +26,7 @@ #define XPSS_SYS_CTRL_BASEADDR 0xF8000000 #define XPSS_DEV_CFG_APB_BASEADDR 0xF8007000 #define XPSS_SCU_BASEADDR 0xF8F00000 +#define CONFIG_SCUTIMER_BASEADDR 0xF8F00600 /* Reflect slcr offsets */ struct slcr_regs { diff --git a/include/configs/zynq.h b/include/configs/zynq.h index 2989e72..1147689 100644 --- a/include/configs/zynq.h +++ b/include/configs/zynq.h @@ -50,9 +50,6 @@ #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
Move baseaddr to hardware.h to be shared between configurations. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/cpu/armv7/zynq/timer.c | 1 + arch/arm/include/asm/arch-zynq/hardware.h | 1 + include/configs/zynq.h | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) -- 1.8.2.1