diff options
author | roy zang <tie-fei.zang@freescale.com> | 2006-11-29 09:45:03 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-11-29 09:45:03 +0800 |
commit | 6bd87c0aeea441c49d59fd542b84a9be88d08b17 (patch) | |
tree | e450a5f1e69a78a203a1e15167d7fefa43c5ce7e /Makefile | |
parent | 0a8eb59983047ae3bcc0babf3ee4d10d01abe7da (diff) | |
parent | d2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (diff) | |
download | u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.zip u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.tar.gz u-boot-imx-6bd87c0aeea441c49d59fd542b84a9be88d08b17.tar.bz2 |
Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2
Conflicts:
drivers/cfi_flash.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -984,6 +984,9 @@ xtract_4xx = $(subst _25,,$(subst _33,,$(subst _BA,,$(subst _ME,,$(subst _HI,,$( ADCIOP_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx adciop esd +alpr_config: unconfig + @./mkconfig $(@:_config=) ppc ppc4xx alpr prodrive + AP1000_config:unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ap1000 amirix |