diff options
| author | Minkyu Kang <[email protected]> | 2010-05-31 09:13:11 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-05-31 09:13:11 +0900 |
| commit | 922d27b596c179c5a7d68abe45ede5adb1b6589c (patch) | |
| tree | c5ef3d5dc70bf51646a7fd7a379f6c2b2588cc2e /arch/powerpc/lib/Makefile | |
| parent | de200874fb9ecac51d74b4e9783ebb5d2e94c449 (diff) | |
| parent | 39c209546ab5b11ca6410c5cc57dcbf457e50800 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/include/asm/mach-types.h
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'arch/powerpc/lib/Makefile')
| -rw-r--r-- | arch/powerpc/lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 334e457805c..5f85502d1ca 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -33,6 +33,7 @@ SOBJS-y += reloc.o COBJS-y += bat_rw.o COBJS-y += board.o COBJS-y += bootm.o +COBJS-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount.o COBJS-y += cache.o COBJS-y += extable.o COBJS-y += interrupts.o |