Patchwork [U-Boot,2/4] km/common: use u-boot.kwb for u-boot update function on arm

login
register
mail settings
Submitter Holger Brunck
Date July 5, 2011, 8:24 a.m.
Message ID <1309854242-11354-3-git-send-email-holger.brunck@keymile.com>
Download mbox | patch
Permalink /patch/103218/
State Accepted
Commit 8519d180354fe2d488973e6612902bd552bcf8fb
Headers show

Comments

Holger Brunck - July 5, 2011, 8:24 a.m.
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>
---
 include/configs/km/keymile-common.h |    1 -
 include/configs/km/km-powerpc.h     |    1 +
 include/configs/km/km_arm.h         |    1 +
 3 files changed, 2 insertions(+), 1 deletions(-)
Wolfgang Denk - July 28, 2011, 1:39 p.m.
Dear Holger Brunck,

In message <1309854242-11354-3-git-send-email-holger.brunck@keymile.com> you wrote:
> 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>
> ---
>  include/configs/km/keymile-common.h |    1 -
>  include/configs/km/km-powerpc.h     |    1 +
>  include/configs/km/km_arm.h         |    1 +
>  3 files changed, 2 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

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					\
 	""