diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:02:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:02:16 +0200 |
| commit | 98432d39255c9ff4894bf9917ead3e73a09a6649 (patch) | |
| tree | 4fd77c84466f1a76ff52e05ed50d51b05cda6099 /arch/ppc | |
| parent | f35190d65b08d967ff4e64d69b48c513071fe811 (diff) | |
| download | barebox-98432d39255c9ff4894bf9917ead3e73a09a6649.tar.gz barebox-98432d39255c9ff4894bf9917ead3e73a09a6649.tar.xz | |
svn_rev_683
more cleanups, fix compiler warnings
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/Makefile | 1 | ||||
| -rw-r--r-- | arch/ppc/lib/ticks.S | 22 | ||||
| -rw-r--r-- | arch/ppc/lib/time.c | 1 |
3 files changed, 2 insertions, 22 deletions
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index 878caf28a6..00968ba8d2 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -1,6 +1,7 @@ CPPFLAGS += -fno-builtin -ffreestanding -nostdinc -Wall \ -isystem $(gccincdir) -meabi -Wstrict-prototypes -D __PPC__ -D CONFIG_PPC \ + -fno-strict-aliasing machine-$(CONFIG_ARCH_MPC5200) := mpc5200 diff --git a/arch/ppc/lib/ticks.S b/arch/ppc/lib/ticks.S index b8d25b7f46..2d9cc588de 100644 --- a/arch/ppc/lib/ticks.S +++ b/arch/ppc/lib/ticks.S @@ -41,25 +41,3 @@ get_ticks: cmp 0,r3,r5 bne 1b blr - -/* - * Delay for a number of ticks - */ - .globl wait_ticks -wait_ticks: - mflr r8 /* save link register */ - mr r7, r3 /* save tick count */ - bl get_ticks /* Get start time */ - - /* Calculate end time */ - addc r7, r4, r7 /* Compute end time lower */ - addze r6, r3 /* and end time upper */ - - WATCHDOG_RESET /* Trigger watchdog, if needed */ -1: bl get_ticks /* Get current time */ - subfc r4, r4, r7 /* Subtract current time from end time */ - subfe. r3, r3, r6 - bge 1b /* Loop until time expired */ - - mtlr r8 /* restore link register */ - blr diff --git a/arch/ppc/lib/time.c b/arch/ppc/lib/time.c index 9e73500430..94d5b2608d 100644 --- a/arch/ppc/lib/time.c +++ b/arch/ppc/lib/time.c @@ -25,6 +25,7 @@ #include <clock.h> #include <init.h> #include <asm/arch/clocks.h> +#include <asm/common.h> /* ------------------------------------------------------------------------- */ |