summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Brunck <holger.brunck@keymile.com>2011-07-04 22:24:00 +0000
committerWolfgang Denk <wd@denx.de>2011-07-28 15:39:44 +0200
commit8519d180354fe2d488973e6612902bd552bcf8fb (patch)
tree4edb98067aeea04e03f355de22d63821003fa6f4
parent9485e779a3fb969e026c145bfa645083404e0c1e (diff)
downloadu-boot-imx-8519d180354fe2d488973e6612902bd552bcf8fb.zip
u-boot-imx-8519d180354fe2d488973e6612902bd552bcf8fb.tar.gz
u-boot-imx-8519d180354fe2d488973e6612902bd552bcf8fb.tar.bz2
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.h1
-rw-r--r--include/configs/km/km-powerpc.h1
-rw-r--r--include/configs/km/km_arm.h1
3 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 6a31d26..d749b2b 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 4cec57c..7610358 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 23717f4..d41fcb7 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 \
""