diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-20 00:10:07 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-20 00:10:07 +0200 |
| commit | b18815752f3d6db27877606e4e069e3f6cfe3a19 (patch) | |
| tree | 6c020a953e33ff48304d94f3ec586431321cd147 /Makefile | |
| parent | 683e9f1ea5586d7538c9afa397a0a86ccfb21bff (diff) | |
| parent | 2ea88b063e1547ff013b00e74a4656603be5ed5f (diff) | |
| download | talos-obmc-uboot-b18815752f3d6db27877606e4e069e3f6cfe3a19.tar.gz talos-obmc-uboot-b18815752f3d6db27877606e4e069e3f6cfe3a19.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 1 insertions, 18 deletions
@@ -358,7 +358,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin $(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(TEXT_BASE) -d $< $@ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)tools/ubsha1 $(obj)u-boot.bin @@ -1027,23 +1027,6 @@ scpu_config: unconfig fi @$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive -polaris_config \ -trizepsiv_config : unconfig - @mkdir -p $(obj)include - @if [ "$(findstring polaris,$@)" ] ; then \ - echo "#define CONFIG_POLARIS 1" >>$(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv - -vpac270_nor_config \ -vpac270_onenand_config : unconfig - @mkdir -p $(obj)include - @if [ "$(findstring onenand,$@)" ] ; then \ - echo "#define CONFIG_ONENAND_U_BOOT" \ - >>$(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270 - ######################################################################### ## ARM1136 Systems ######################################################################### |
