From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Wed, 5 Jan 2011 06:21:29 +0000 (+0900)
Subject: s5p: universal: fix wrong load address in update macro
X-Git-Tag: v0.2~78
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca64f890365bd516032b26a6dc00ed459462d232;p=kernel%2Fu-boot.git

s5p: universal: fix wrong load address in update macro
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---

diff --git a/board/samsung/universal_c110/universal.c b/board/samsung/universal_c110/universal.c
index 7d99688..cf02c4e 100644
--- a/board/samsung/universal_c110/universal.c
+++ b/board/samsung/universal_c110/universal.c
@@ -813,15 +813,15 @@ static void check_auto_burn(void)
 		puts("Auto burning bootloader (eMMC)\n");
 		count += sprintf(buf + count, "run updatemmc; ");
 	}
-	/* Backup u-boot in eMMC */
-	if (readl(magic_base) == 0x4261636B) {		/* ASICC: Back */
-		puts("Auto buring u-boot image (boot partition2 in eMMC)\n");
-		count += sprintf(buf + count, "run updatebackup; ");
-	}
 	if (readl(magic_base + 0x04) == 0x4b65726e) {	/* ASICC: Kern */
 		puts("Auto burning kernel\n");
 		count += sprintf(buf + count, "run updatek; ");
 	}
+	/* Backup u-boot in eMMC */
+	if (readl(magic_base + 0x8) == 0x4261636B) {	/* ASICC: Back */
+		puts("Auto buring u-boot image (boot partition2 in eMMC)\n");
+		count += sprintf(buf + count, "run updatebackup; ");
+	}
 
 	if (count) {
 		count += sprintf(buf + count, "reset");
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index e04f078..7e0912a 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -247,15 +247,15 @@ static void check_auto_burn(void)
 		puts("Auto buring bootloader (eMMC)\n");
 		count += sprintf(buf + count, "run updatemmc; ");
 	}
-	/* Backup u-boot in eMMC */
-	if (readl(magic_base) == 0x4261636B) {		/* ASICC: Back */
-		puts("Auto buring u-boot image (boot partition2 in eMMC)\n");
-		count += sprintf(buf + count, "run updatebackup; ");
-	}
 	if (readl(magic_base + 0x4) == 0x4b65726e) {	/* ASICC: Kern */
 		puts("Auto buring kernel\n");
 		count += sprintf(buf + count, "run updatek; ");
 	}
+	/* Backup u-boot in eMMC */
+	if (readl(magic_base + 0x8) == 0x4261636B) {	/* ASICC: Back */
+		puts("Auto buring u-boot image (boot partition2 in eMMC)\n");
+		count += sprintf(buf + count, "run updatebackup; ");
+	}
 
 	if (count) {
 		count += sprintf(buf + count, "reset");
diff --git a/include/configs/s5pc110_universal.h b/include/configs/s5pc110_universal.h
index ef68e8d..0859fab 100644
--- a/include/configs/s5pc110_universal.h
+++ b/include/configs/s5pc110_universal.h
@@ -284,7 +284,7 @@
 	" bootm 0x30007FC0\0" \
 	"updatemmc=mmc boot 0 1 1 1; mmc write 0 0x32008000 0 0x200;" \
 		" mmc boot 0 1 1 0\0" \
-	"updatebackup=mmc boot 0 1 1 2; mmc write 0 0x32000000 0 0x200;" \
+	"updatebackup=mmc boot 0 1 1 2; mmc write 0 0x32004000 0 0x200;" \
 		" mmc boot 0 1 1 0\0" \
 	"flashboot=set bootargs root=/dev/mtdblock${bootblock}" \
 	 " rootfstype=${rootfstype}" \
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 2d32376..5366a4f 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -267,7 +267,7 @@
 	"bootk=run loaduimage; bootm 0x40007FC0\0" \
 	"updatemmc=mmc boot 0 1 1 1; mmc write 0 0x42008000 0 0x200;" \
 		" mmc boot 0 1 1 0\0" \
-	"updatebackup=mmc boot 0 1 1 2; mmc write 0 0x42000000 0 0x200;" \
+	"updatebackup=mmc boot 0 1 1 2; mmc write 0 0x42004000 0 0x200;" \
 		" mmc boot 0 1 1 0\0" \
 	"lpj=lpj=3981312\0" \
 	"ubifsboot=set bootargs root=ubi0!rootfs rootfstype=ubifs ${lpj} " \