[uboot-tools] update to 2013.01 release

[Dennis Gilmore]

commit 100bc5aecb8834b35b7fa0780e26191a2d91ded6
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Jan 29 13:39:25 2013 -0600

    update to 2013.01 release

 0001-panda-convert-to-uEnv.txt-bootscript.patch |   31 ++++++-----------------
 u-boot-fat.patch                                |    2 +-
 uboot-omap-fit.patch                            |    9 ++++++
 uboot-tools.spec                                |    9 +++++-
 4 files changed, 25 insertions(+), 26 deletions(-)
---
diff --git a/0001-panda-convert-to-uEnv.txt-bootscript.patch b/0001-panda-convert-to-uEnv.txt-bootscript.patch
index cd7a732..7eed70a 100644
--- a/0001-panda-convert-to-uEnv.txt-bootscript.patch
+++ b/0001-panda-convert-to-uEnv.txt-bootscript.patch
@@ -1,18 +1,6 @@
-From aed767e84ab0b6c3b63343a374c3a63b5937580e Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson at gmail.com>
-Date: Sun, 1 Apr 2012 11:44:25 -0500
-Subject: [PATCH] panda: convert to uEnv.txt bootscript
-
-Signed-off-by: Robert Nelson <robertcnelson at gmail.com>
----
- include/configs/omap4_common.h |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
-index 21e0f60..98994c3 100644
---- a/include/configs/omap4_common.h
-+++ b/include/configs/omap4_common.h
-@@ -162,23 +162,29 @@
+--- 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" \
@@ -20,17 +8,17 @@ index 21e0f60..98994c3 100644
 -	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
 -		"source ${loadaddr}\0" \
 +	"bootenv=uEnv.txt\0" \
-+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\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} ...; " \
-+	"mmcboot=echo Booting from mmc ...; " \
+ 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
  		"run mmcargs; " \
- 		"bootm ${loadaddr}\0" \
+@@ -166,13 +168,18 @@
  
  #define CONFIG_BOOTCOMMAND \
- 	"if mmc rescan ${mmcdev}; then " \
+ 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 -		"if run loadbootscript; then " \
 -			"run bootscript; " \
 -		"else " \
@@ -53,6 +41,3 @@ index 21e0f60..98994c3 100644
  	"fi"
  
  #define CONFIG_AUTO_COMPLETE		1
--- 
-1.7.9.1
-
diff --git a/u-boot-fat.patch b/u-boot-fat.patch
index a9cefe9..42c083e 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
-@@ -114,7 +114,7 @@
+@@ -83,7 +83,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
new file mode 100644
index 0000000..8b7544e
--- /dev/null
+++ b/uboot-omap-fit.patch
@@ -0,0 +1,9 @@
+--- 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 @@
+ 
+ #define CONFIG_SYS_THUMB_BUILD
+ 
++#define CONFIG_FIT
++
+ #endif /* __CONFIG_OMAP4_COMMON_H */
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 602e178..3c6bc8e 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,7 +1,7 @@
 #global candidate rc3
 
 Name:           uboot-tools
-Version:        2012.10
+Version:        2013.01
 Release:        1%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
@@ -11,8 +11,9 @@ 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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2:         uboot-omap-fit.patch
 
+Requires:       dtc
 
 
 # build the tool for manipulation with environment only on arm
@@ -66,6 +67,7 @@ u-boot bootloader binaries for smdk310 board
 %setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 mkdir builds
 
 %build
@@ -184,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan 24 2013 Dennis Gilmore <dennis at ausil.us> - 2013.01-1
+- update to 2013.01 release
+
 * Wed Oct 17 2012 Dennis Gilmore <dennis at ausil.us> - 2012.10-1
 update to final 2012.10 release