diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-11-09 00:33:10 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-09 00:33:10 +0100 |
| commit | 2e4dcb64d1c6bc0bcab2432d41b0185e0eb942ae (patch) | |
| tree | 3d63b8048db0ee4176020e05e521c1ab41289b65 /cpu/arm926ejs | |
| parent | 23b7b87a37e8732a0229d52e69f5e7e617834f80 (diff) | |
| parent | 26eecd24f97130e56e9c2c2af0e714e05bce6e00 (diff) | |
| download | u-boot-imx-2e4dcb64d1c6bc0bcab2432d41b0185e0eb942ae.zip u-boot-imx-2e4dcb64d1c6bc0bcab2432d41b0185e0eb942ae.tar.gz u-boot-imx-2e4dcb64d1c6bc0bcab2432d41b0185e0eb942ae.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'cpu/arm926ejs')
| -rw-r--r-- | cpu/arm926ejs/Makefile | 2 | ||||
| -rw-r--r-- | cpu/arm926ejs/omap/Makefile | 2 | ||||
| -rw-r--r-- | cpu/arm926ejs/omap/cpuinfo.c (renamed from cpu/arm926ejs/cpuinfo.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm926ejs/Makefile b/cpu/arm926ejs/Makefile index 0facce4..d5ac7d3 100644 --- a/cpu/arm926ejs/Makefile +++ b/cpu/arm926ejs/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a START = start.o -COBJS = interrupts.o cpu.o cpuinfo.o +COBJS = interrupts.o cpu.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/cpu/arm926ejs/omap/Makefile b/cpu/arm926ejs/omap/Makefile index c335d5c..74aea74 100644 --- a/cpu/arm926ejs/omap/Makefile +++ b/cpu/arm926ejs/omap/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a -COBJS = timer.o +COBJS = timer.o cpuinfo.o SOBJS = reset.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/cpu/arm926ejs/cpuinfo.c b/cpu/arm926ejs/omap/cpuinfo.c index 35ba7db..35ba7db 100644 --- a/cpu/arm926ejs/cpuinfo.c +++ b/cpu/arm926ejs/omap/cpuinfo.c |