Commit 8bf69d81 authored by Sascha Hauer's avatar Sascha Hauer Committed by Peter Pearse
Browse files

Separate omap24xx specific code from arm1136



Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm1136 to cpu/arm1136/omap24xx.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGuennadi Liakhovetski <lg@denx.de>
parent 8c16cb0d
...@@ -2590,12 +2590,12 @@ zylonite_config : ...@@ -2590,12 +2590,12 @@ zylonite_config :
## ARM1136 Systems ## ARM1136 Systems
######################################################################### #########################################################################
omap2420h4_config : unconfig omap2420h4_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
apollon_config : unconfig apollon_config : unconfig
@mkdir -p $(obj)include @mkdir -p $(obj)include
@echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
@$(MKCONFIG) $(@:_config=) arm arm1136 apollon @$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
@echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
#======================================================================== #========================================================================
......
...@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk ...@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
START = start.o START = start.o
COBJS = interrupts.o cpu.o COBJS = cpu.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
......
...@@ -33,9 +33,6 @@ ...@@ -33,9 +33,6 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
#include <asm/arch/omap2420.h>
#endif
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -47,10 +44,10 @@ static unsigned long read_p15_c1 (void) ...@@ -47,10 +44,10 @@ static unsigned long read_p15_c1 (void)
unsigned long value; unsigned long value;
__asm__ __volatile__( __asm__ __volatile__(
"mrc p15, 0, %0, c1, c0, 0 @ read control reg\n" "mrc p15, 0, %0, c1, c0, 0 @ read control reg\n"
: "=r" (value) : "=r" (value)
: :
: "memory"); : "memory");
return value; return value;
} }
......
#
# (C) Copyright 2000-2008
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
# project.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundatio; either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).a
COBJS = interrupts.o
SOBJS = start.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
all: $(obj).depend $(LIB)
$(LIB): $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS)
#########################################################################
# defines $(obj).depend target
include $(SRCTREE)/rules.mk
sinclude $(obj).depend
#########################################################################
...@@ -32,31 +32,28 @@ ...@@ -32,31 +32,28 @@
#include <common.h> #include <common.h>
#include <asm/arch/bits.h> #include <asm/arch/bits.h>
#include <asm/arch/omap2420.h>
#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
# include <asm/arch/omap2420.h>
#endif
#define TIMER_LOAD_VAL 0 #define TIMER_LOAD_VAL 0
/* macro to read the 32 bit timer */ /* macro to read the 32 bit timer */
#define READ_TIMER (*(volatile ulong *)(CFG_TIMERBASE+TCRR)) #define READ_TIMER (*volatile ulong*(CFG_TIMERBASE+TCRR))
#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR)
/* Use the IntegratorCP function from board/integratorcp.c */
#else
static ulong timestamp; static ulong timestamp;
static ulong lastinc; static ulong lastinc;
/* nothing really to do with interrupts, just starts up a counter. */ /*
int interrupt_init (void) * nothing really to do with interrupts, just starts up a counter.
*/
int interrupt_init(void)
{ {
int32_t val; int32_t val;
/* Start the counter ticking up */ /* Start the counter ticking up */
*((int32_t *) (CFG_TIMERBASE + TLDR)) = TIMER_LOAD_VAL; /* reload value on overflow*/ /* reload value on overflow*/
val = (CFG_PVT << 2) | BIT5 | BIT1 | BIT0; /* mask to enable timer*/ *((int32_t *) (CFG_TIMERBASE + TLDR)) = TIMER_LOAD_VAL;
/* mask to enable timer*/
val = (CFG_PVT << 2) | BIT5 | BIT1 | BIT0;
*((int32_t *) (CFG_TIMERBASE + TCLR)) = val; /* start timer */ *((int32_t *) (CFG_TIMERBASE + TCLR)) = val; /* start timer */
reset_timer_masked(); /* init the timestamp and lastinc value */ reset_timer_masked(); /* init the timestamp and lastinc value */
...@@ -66,82 +63,99 @@ int interrupt_init (void) ...@@ -66,82 +63,99 @@ int interrupt_init (void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
void reset_timer (void) void reset_timer(void)
{ {
reset_timer_masked (); reset_timer_masked();
} }
ulong get_timer (ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked () - base; return get_timer_masked() - base;
} }
void set_timer (ulong t) void set_timer(ulong t)
{ {
timestamp = t; timestamp = t;
} }
/* delay x useconds AND perserve advance timstamp value */ /* delay x useconds AND perserve advance timstamp value */
void udelay (unsigned long usec) void udelay(unsigned long usec)
{ {
ulong tmo, tmp; ulong tmo, tmp;
if (usec >= 1000) { /* if "big" number, spread normalization to seconds */ /* if "big" number, spread normalization to seconds */
tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ if (usec >= 1000) {
tmo *= CFG_HZ; /* find number of "ticks" to wait to achieve target */ /* start to normalize for usec to ticks per sec */
tmo /= 1000; /* finish normalize. */ tmo = usec / 1000;
} else { /* else small number, don't kill it prior to HZ multiply */ /* find number of "ticks" to wait to achieve target */
tmo *= CFG_HZ;
/* finish normalize. */
tmo /= 1000;
} else {
/* else small number, don't kill it prior to HZ multiply */
tmo = usec * CFG_HZ; tmo = usec * CFG_HZ;
tmo /= (1000*1000); tmo /= (1000*1000);
} }
/* get current timestamp */
tmp = get_timer (0); /* get current timestamp */ tmp = get_timer(0);
if ( (tmo + tmp + 1) < tmp )/* if setting this forward will roll time stamp */ if ((tmo + tmp + 1) < tmp)
reset_timer_masked (); /* reset "advancing" timestamp to 0, set lastinc value */ /* setting this forward will roll time stamp */
/* reset "advancing" timestamp to 0, set lastinc value */
reset_timer_masked();
else else
tmo += tmp; /* else, set advancing stamp wake up time */ /* else, set advancing stamp wake up time */
while (get_timer_masked () < tmo)/* loop till event */ tmo += tmp;
while (get_timer_masked() < tmo)/* loop till event */
/*NOP*/; /*NOP*/;
} }
void reset_timer_masked (void) void reset_timer_masked(void)
{ {
/* reset time */ /* reset time */
lastinc = READ_TIMER; /* capture current incrementer value time */ /* capture current incrementer value time */
timestamp = 0; /* start "advancing" time stamp from 0 */ lastinc = READ_TIMER;
/* start "advancing" time stamp from 0 */
timestamp = 0;
} }
ulong get_timer_masked (void) ulong get_timer_masked(void)
{ {
ulong now = READ_TIMER; /* current tick value */ ulong now = READ_TIMER; /* current tick value */
if (now >= lastinc) /* normal mode (non roll) */ /* normal mode (non roll) */
timestamp += (now - lastinc); /* move stamp fordward with absoulte diff ticks */ if (now >= lastinc)
else /* we have rollover of incrementer */ /* move stamp forward with absolute diff ticks */
timestamp += (now - lastinc);
else
/* we have rollover of incrementer */
timestamp += (0xFFFFFFFF - lastinc) + now; timestamp += (0xFFFFFFFF - lastinc) + now;
lastinc = now; lastinc = now;
return timestamp; return timestamp;
} }
/* waits specified delay value and resets timestamp */ /* waits specified delay value and resets timestamp */
void udelay_masked (unsigned long usec) void udelay_masked(unsigned long usec)
{ {
ulong tmo; ulong tmo;
ulong endtime; ulong endtime;
signed long diff; signed long diff;
if (usec >= 1000) { /* if "big" number, spread normalization to seconds */ if (usec >= 1000) {
tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ /* "big" number, spread normalization to seconds */
tmo *= CFG_HZ; /* find number of "ticks" to wait to achieve target */ /* start to normalize for usec to ticks per sec */
tmo /= 1000; /* finish normalize. */ tmo = usec / 1000;
} else { /* else small number, don't kill it prior to HZ multiply */ /* find number of "ticks" to wait to achieve target */
tmo *= CFG_HZ;
tmo /= 1000;/* finish normalize. */
} else {
/* else small number, don't kill it prior to HZ multiply */
tmo = usec * CFG_HZ; tmo = usec * CFG_HZ;
tmo /= (1000*1000); tmo /= (1000*1000);
} }
endtime = get_timer_masked () + tmo; endtime = get_timer_masked() + tmo;
do { do {
ulong now = get_timer_masked (); ulong now = get_timer_masked();
diff = endtime - now; diff = endtime - now;
} while (diff >= 0); } while (diff >= 0);
} }
...@@ -158,10 +172,9 @@ unsigned long long get_ticks(void) ...@@ -158,10 +172,9 @@ unsigned long long get_ticks(void)
* This function is derived from PowerPC code (timebase clock frequency). * This function is derived from PowerPC code (timebase clock frequency).
* On ARM it returns the number of timer ticks per second. * On ARM it returns the number of timer ticks per second.
*/ */
ulong get_tbclk (void) ulong get_tbclk(void)
{ {
ulong tbclk; ulong tbclk;
tbclk = CFG_HZ; tbclk = CFG_HZ;
return tbclk; return tbclk;
} }
#endif /* !Integrator/CP */
/*
* armboot - Startup Code for OMP2420/ARM1136 CPU-core
*
* Copyright (c) 2004 Texas Instruments <r-woodruff2@ti.com>
*
* Copyright (c) 2001 Marius Gr??ger <mag@sysgo.de>
* Copyright (c) 2002 Alex Z??pke <azu@sysgo.de>
* Copyright (c) 2002 Gary Jennejohn <gj@denx.de>
* Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com>
* Copyright (c) 2003 Kshitij <kshitij@ti.com>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <asm/arch/omap2420.h>
.globl reset_cpu
reset_cpu:
ldr r1, rstctl /* get addr for global reset reg */
mov r3, #0x2 /* full reset pll+mpu */
str r3, [r1] /* force reset */
mov r0, r0
_loop_forever:
b _loop_forever
rstctl:
.word PM_RSTCTRL_WKUP
...@@ -30,9 +30,6 @@ ...@@ -30,9 +30,6 @@
#include <config.h> #include <config.h>
#include <version.h> #include <version.h>
#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
#include <asm/arch/omap2420.h>
#endif
.globl _start .globl _start
_start: b reset _start: b reset
#ifdef CONFIG_ONENAND_IPL #ifdef CONFIG_ONENAND_IPL
...@@ -438,22 +435,4 @@ fiq: ...@@ -438,22 +435,4 @@ fiq:
arm1136_cache_flush: arm1136_cache_flush:
mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache
mov pc, lr @ back to caller mov pc, lr @ back to caller
#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR)
/* Use the IntegratorCP function from board/integratorcp/platform.S */
#else
.align 5
.globl reset_cpu
reset_cpu:
ldr r1, rstctl /* get addr for global reset reg */
mov r3, #0x2 /* full reset pll+mpu */
str r3, [r1] /* force reset */
mov r0, r0
_loop_forever:
b _loop_forever
rstctl:
.word PM_RSTCTRL_WKUP
#endif
#endif /* CONFIG_ONENAND_IPL */ #endif /* CONFIG_ONENAND_IPL */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment