[U-Boot] [PATCH] ARM: fix build error

Lei Wen leiwen at marvell.com
Mon Aug 1 06:05:20 CEST 2011


error message:
/home/leiwen/reps/clones/uboot/include/asm/u-boot-arm.h:66: error:
conflicting types for 'setenv'
/home/leiwen/reps/clones/uboot/include/common.h:271: note: previous
declaration of 'setenv' was here

Since common code has change the setenv declaration method, follow
the common code to do the same change.

Signed-off-by: Lei Wen <leiwen at marvell.com>
---
 arch/arm/include/asm/u-boot-arm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 3904027..b01a0e9 100644
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -63,7 +63,7 @@ void	setup_revision_tag (struct tag **params);
 /* To be fixed!							*/
 /* ------------------------------------------------------------ */
 /* common/cmd_nvedit.c */
-int	setenv		(char *, char *);
+int	setenv		(const char *, const char *);
 
 /* cpu/.../interrupt.c */
 int	arch_interrupt_init	(void);
-- 
1.7.0.4



More information about the U-Boot mailing list