diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
| commit | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch) | |
| tree | a046b11024bdf0a41082647c95df23a10cb206fc /Makefile | |
| parent | d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff) | |
| parent | 28e57108a61bd0e554d9847170b8ad9dad093e07 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts:
include/configs/km_arm.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -357,7 +357,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ $(obj)u-boot.kwb: $(obj)u-boot.bin - $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ + $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ $(obj)u-boot.sha1: $(obj)u-boot.bin |