From 86207dd2abe405ec42e262635e04a3db7a0b53f5 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 2 Sep 2013 18:57:06 +0100
Subject: [PATCH] Add patch for Panda ES memory type issue

---
 omap4-panda-memtiming.patch | 11 +++++++++++
 uboot-tools.spec            | 10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 omap4-panda-memtiming.patch

diff --git a/omap4-panda-memtiming.patch b/omap4-panda-memtiming.patch
new file mode 100644
index 0000000..6997ac1
--- /dev/null
+++ b/omap4-panda-memtiming.patch
@@ -0,0 +1,11 @@
+--- u-boot-2013.07/include/configs/omap4_common.h.orig	2013-09-01 19:46:54.646300234 +0100
++++ u-boot-2013.07/include/configs/omap4_common.h	2013-09-01 19:47:11.972540353 +0100
+@@ -255,8 +255,6 @@
+ #define CONFIG_SYS_CACHELINE_SIZE	32
+ 
+ /* Defines for SDRAM init */
+-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+-
+ #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+ #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
+ #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
diff --git a/uboot-tools.spec b/uboot-tools.spec
index f8535ee..3d3caf5 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -3,7 +3,7 @@
 
 Name:           uboot-tools
 Version:        2013.07
-Release:        1%{?candidate:.%{candidate}}%{?dist}
+Release:        2%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
 Group:          Development/Tools
@@ -40,6 +40,10 @@ Patch22: 0013-beaglebone-enable-CONFIG_SUPPORT_RAW_INITRD-option.patch
 Patch23: 0014-mmc-Add-RSTN-enable-for-emmc.patch
 Patch24: 0015-wandboard-add-pxe-support-set-default-boot-command-l.patch
 
+# Panda ES memory timing issue
+Patch25: omap4-panda-memtiming.patch
+
+
 Requires:       dtc
 
 # build the tool for manipulation with environment only on arm
@@ -149,6 +153,7 @@ u-boot bootloader binaries for Wandboard i.MX6 Solo
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1 -b .panda
 
 mkdir builds
 
@@ -338,6 +343,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep  1 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2013.07-2
+- Add patch for Panda ES memory type issue
+
 * Fri Jul 26 2013 Dennis Gilmore <dennis@ausil.us> - 2013.07-1
 - update to 2013.07 final