diff options
| author | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 08:38:06 (GMT) |
|---|---|---|
| committer | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 08:38:06 (GMT) |
| commit | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch) | |
| tree | 5828044d71e5caa3bec4d05c6c48793df0cd17a3 /lib_generic/Makefile | |
| parent | 18e69a35efbb078403db0c0063986470dad7d082 (diff) | |
| parent | 388b82fddc7c05596f3f615f190da0448227dc82 (diff) | |
| download | u-boot-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.xz | |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Diffstat (limited to 'lib_generic/Makefile')
| -rw-r--r-- | lib_generic/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib_generic/Makefile b/lib_generic/Makefile index 9713353..abee19a 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -34,7 +34,9 @@ COBJS-y += crc32.o COBJS-y += ctype.o COBJS-y += display_options.o COBJS-y += div64.o +COBJS-y += lmb.o COBJS-y += ldiv.o +COBJS-$(CONFIG_MD5) += md5.o COBJS-y += sha1.o COBJS-y += string.o COBJS-y += vsprintf.o |