diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
| commit | a48ecc969f8d2d0fe9167962e9b8b4cca52de10b (patch) | |
| tree | 604e04770713cb314cb6184e26eeb4319dec3d43 /cpu/arm1176/s3c64xx/Makefile | |
| parent | bec9cab9291bb221714d559a44fe37669a8ca604 (diff) | |
| parent | ceb70b466e75ceb1a621b6163f7e31116bfc8094 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/spi/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/arm1176/s3c64xx/Makefile')
| -rw-r--r-- | cpu/arm1176/s3c64xx/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/arm1176/s3c64xx/Makefile b/cpu/arm1176/s3c64xx/Makefile index 4656d9a87..b52793913 100644 --- a/cpu/arm1176/s3c64xx/Makefile +++ b/cpu/arm1176/s3c64xx/Makefile @@ -28,6 +28,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a +SOBJS = reset.o + COBJS-$(CONFIG_S3C6400) += cpu_init.o speed.o COBJS-y += timer.o |