Prepare v2013.01.01

Signed-off-by: Tom Rini <trini@ti.com>
vfat: Fix mkcksum argument sizes
2013-01-31 14:47:42 -05:00 · 2013-01-31 14:46:43 -05:00 · 2013-01-31 14:46:40 -05:00
3 changed files with 4 additions and 4 deletions
--- a/2
+++ b/2
@ -23,7 +23,7 @@

 VERSION = 2013
 PATCHLEVEL = 01
-SUBLEVEL =
+SUBLEVEL = 01
 EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@ -488,7 +488,7 @@ static char *failed = "*** failed ***\n";
 static int should_load_env(void)
 {
 #ifdef CONFIG_OF_CONTROL
-	return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
+	return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
 #elif defined CONFIG_DELAY_ENVIRONMENT
 	return 0;
 #else
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@ -569,9 +569,9 @@ static __u8 mkcksum(const char name[8], const char ext[3])

 	__u8 ret = 0;

-	for (i = 0; i < sizeof(name); i++)
+	for (i = 0; i < 8; i++)
 		ret = (((ret & 1) << 7) | ((ret & 0xfe) >> 1)) + name[i];
-	for (i = 0; i < sizeof(ext); i++)
+	for (i = 0; i < 3; i++)
 		ret = (((ret & 1) << 7) | ((ret & 0xfe) >> 1)) + ext[i];

 	return ret;