diff options
| author | Holger Brunck <holger.brunck@keymile.com> | 2011-07-04 22:24:00 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-28 15:39:44 +0200 |
| commit | 8519d180354fe2d488973e6612902bd552bcf8fb (patch) | |
| tree | 4edb98067aeea04e03f355de22d63821003fa6f4 | |
| parent | 9485e779a3fb969e026c145bfa645083404e0c1e (diff) | |
| download | olio-uboot-2014.01-8519d180354fe2d488973e6612902bd552bcf8fb.tar.xz olio-uboot-2014.01-8519d180354fe2d488973e6612902bd552bcf8fb.zip | |
km/common: use u-boot.kwb for u-boot update function on arm
Now we use the standard u-boot make to build the Kirkwood binary.
The output file is u-boot.kwb. So use this name for the tftp
update function to avoid confusion, because this is the binary we
need on Kirkwood.
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
| -rw-r--r-- | include/configs/km/keymile-common.h | 1 | ||||
| -rw-r--r-- | include/configs/km/km-powerpc.h | 1 | ||||
| -rw-r--r-- | include/configs/km/km_arm.h | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 6a31d265e..d749b2bce 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -248,7 +248,6 @@ "stderr=serial\0" \ "stdin=serial\0" \ "stdout=serial\0" \ - "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \ "" #endif /* CONFIG_KM_DEF_ENV */ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 4cec57cf3..7610358d8 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -75,6 +75,7 @@ "cramfsload ${fdt_addr_r} " \ "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ "fdt_addr_r=" xstr(CONFIG_KM_FDT_ADDR) "\0" \ + "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \ "update=" \ "protect off " xstr(BOOTFLASH_START) " +${filesize} && "\ "erase " xstr(BOOTFLASH_START) " +${filesize} && " \ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 23717f4cb..d41fcb760 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -74,6 +74,7 @@ #define CONFIG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - -\0" \ "cramfsloadfdt=true\0" \ + "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ CONFIG_KM_DEF_ENV_UPDATE \ "" |