From f66dd369d61485a0cebe37402df875a51aba4bad Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 5 Apr 2013 08:41:51 -0500
Subject: [PATCH] update to 2013.04-rc2

---
 .gitignore                                    |  2 +
 ...panda-convert-to-uEnv.txt-bootscript.patch | 43 -------------------
 sources                                       |  2 +-
 u-boot-fat.patch                              |  2 +-
 uboot-omap-fit.patch                          |  2 +-
 uboot-tools.spec                              | 11 ++---
 6 files changed, 11 insertions(+), 51 deletions(-)
 delete mode 100644 0001-panda-convert-to-uEnv.txt-bootscript.patch

diff --git a/.gitignore b/.gitignore
index 98dc0b5..5f1a4aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ u-boot-2010.03.tar.bz2
 /u-boot-2012.10.tar.bz2
 /u-boot-2013.01.tar.bz2
 /u-boot-2013.01.01.tar.bz2
+/u-boot-2013.04-rc1.tar.bz2
+/u-boot-2013.04-rc2.tar.bz2
diff --git a/0001-panda-convert-to-uEnv.txt-bootscript.patch b/0001-panda-convert-to-uEnv.txt-bootscript.patch
deleted file mode 100644
index 7eed70a..0000000
--- a/0001-panda-convert-to-uEnv.txt-bootscript.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- u-boot-2013.01/include/configs/omap4_common.h.orig	2013-01-15 15:47:42.000000000 -0600
-+++ u-boot-2013.01/include/configs/omap4_common.h	2013-01-29 13:36:43.664643761 -0600
-@@ -156,9 +156,11 @@
- 		"vram=${vram} " \
- 		"root=${mmcroot} " \
- 		"rootfstype=${mmcrootfstype}\0" \
--	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
--	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
--		"source ${loadaddr}\0" \
-+	"bootenv=uEnv.txt\0" \
-+	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-+	"importbootenv=echo Importing environment from mmc ...; " \
-+		"env import -t $loadaddr $filesize\0" \
-+	"bootscript=echo Running bootscript from mmc ...; " \
- 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
- 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
- 		"run mmcargs; " \
-@@ -166,13 +168,18 @@
- 
- #define CONFIG_BOOTCOMMAND \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
--		"if run loadbootscript; then " \
--			"run bootscript; " \
--		"else " \
--			"if run loaduimage; then " \
--				"run mmcboot; " \
--			"fi; " \
--		"fi; " \
-+		"echo SD/MMC found on device ${mmcdev};" \
-+		"if run loadbootenv; then " \
-+			"echo Loaded environment from ${bootenv};" \
-+			"run importbootenv;" \
-+		"fi;" \
-+		"if test -n $uenvcmd; then " \
-+			"echo Running uenvcmd ...;" \
-+			"run uenvcmd;" \
-+		"fi;" \
-+		"if run loaduimage; then " \
-+			"run mmcboot;" \
-+		"fi;" \
- 	"fi"
- 
- #define CONFIG_AUTO_COMPLETE		1
diff --git a/sources b/sources
index 931198a..2b55579 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73939f78606f89a1775c7e9acb2ca617  u-boot-2013.01.01.tar.bz2
+67e9aced68aa92006b7c9ba7e9d1ce50  u-boot-2013.04-rc2.tar.bz2
diff --git a/u-boot-fat.patch b/u-boot-fat.patch
index 42c083e..1aa90bd 100644
--- a/u-boot-fat.patch
+++ b/u-boot-fat.patch
@@ -1,7 +1,7 @@
 diff -uNr u-boot-2012.04.01.orig/fs/fat/fat.c u-boot-2012.04.01/fs/fat/fat.c
 --- u-boot-2012.04.01.orig/fs/fat/fat.c	2012-04-25 08:22:50.000000000 -0500
 +++ u-boot-2012.04.01/fs/fat/fat.c	2012-06-19 14:06:16.605337811 -0500
-@@ -83,7 +83,7 @@
+@@ -90,7 +90,7 @@
  	/* Check for FAT12/FAT16/FAT32 filesystem */
  	if (!memcmp(buffer + DOS_FS_TYPE_OFFSET, "FAT", 3))
  		return 0;
diff --git a/uboot-omap-fit.patch b/uboot-omap-fit.patch
index 8b7544e..cdcc79b 100644
--- a/uboot-omap-fit.patch
+++ b/uboot-omap-fit.patch
@@ -1,6 +1,6 @@
 --- u-boot-2012.07/include/configs/omap4_common.h.orig	2013-01-24 00:20:40.334731642 -0600
 +++ u-boot-2012.07/include/configs/omap4_common.h	2013-01-24 00:21:08.708953803 -0600
-@@ -278,4 +278,6 @@
+@@ -280,4 +280,6 @@
  
  #define CONFIG_SYS_THUMB_BUILD
  
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 76d3d13..b6ec501 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,15 +1,14 @@
-#global candidate rc3
+%global candidate rc2
 
 Name:           uboot-tools
-Version:        2013.01.01
-Release:        1%{?candidate:.%{candidate}}%{?dist}
+Version:        2013.04
+Release:        0.1%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.denx.de/wiki/U-Boot
 Source0:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
-Patch0:         0001-panda-convert-to-uEnv.txt-bootscript.patch
 Patch1:         u-boot-fat.patch
 Patch2:         uboot-omap-fit.patch
 
@@ -65,7 +64,6 @@ u-boot bootloader binaries for smdk310 board
 
 %prep
 %setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 mkdir builds
@@ -186,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Mar 31 2013 Dennis Gilmore <dennis@ausil.us> - 2013.04-0.1.rc1
+- update to 2013.04-rc2
+
 * Fri Mar 01 2013 Dennis Gilmore <dennis@ausil.us> - 2013.01.01-1
 - update to 2013.01.01 for bug#907139