diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-02-11 12:55:32 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-02-11 12:55:32 +0100 |
| commit | 17998eff9021b7b579c0387e934d8c52603fe247 (patch) | |
| tree | edc3ef069db4cdaf9c718ae60e095caf42cd1d0d /arch/arm/cpu/arm1176 | |
| parent | 6ba45cc0f8b46533965219cfd90864a60ec1009b (diff) | |
| parent | e97f9d817e600cd6f43d1d0da76f5787e33a5c56 (diff) | |
| download | u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.zip u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.tar.gz u-boot-imx-17998eff9021b7b579c0387e934d8c52603fe247.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/arm1176')
| -rw-r--r-- | arch/arm/cpu/arm1176/bcm2835/mbox.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm1176/bcm2835/timer.c | 5 | ||||
| -rw-r--r-- | arch/arm/cpu/arm1176/config.mk | 8 |
3 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/cpu/arm1176/bcm2835/mbox.c b/arch/arm/cpu/arm1176/bcm2835/mbox.c index 4daf1e4..3b17a31 100644 --- a/arch/arm/cpu/arm1176/bcm2835/mbox.c +++ b/arch/arm/cpu/arm1176/bcm2835/mbox.c @@ -8,7 +8,7 @@ #include <asm/io.h> #include <asm/arch/mbox.h> -#define TIMEOUT (100 * 1000) /* 100mS in uS */ +#define TIMEOUT 1000 /* ms */ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) { diff --git a/arch/arm/cpu/arm1176/bcm2835/timer.c b/arch/arm/cpu/arm1176/bcm2835/timer.c index 2edd671..017907c 100644 --- a/arch/arm/cpu/arm1176/bcm2835/timer.c +++ b/arch/arm/cpu/arm1176/bcm2835/timer.c @@ -18,11 +18,6 @@ #include <asm/io.h> #include <asm/arch/timer.h> -int timer_init(void) -{ - return 0; -} - ulong get_timer_us(ulong base) { struct bcm2835_timer_regs *regs = diff --git a/arch/arm/cpu/arm1176/config.mk b/arch/arm/cpu/arm1176/config.mk index f4631cb..5dc2ebb 100644 --- a/arch/arm/cpu/arm1176/config.mk +++ b/arch/arm/cpu/arm1176/config.mk @@ -7,11 +7,3 @@ # Make ARMv5 to allow more compilers to work, even though its v6. PLATFORM_CPPFLAGS += -march=armv5t -# ========================================================================= -# -# Supply options according to compiler version -# -# ========================================================================= -PF_RELFLAGS_SLB_AT := $(call cc-option,-mshort-load-bytes,\ - $(call cc-option,-malignment-traps,)) -PLATFORM_RELFLAGS += $(PF_RELFLAGS_SLB_AT) |