u-boot-xlnx_2015.01: Add patches to fix MicroBlaze issues

* Add patch to fix issue with EMAC lite #define's
* Add patch to disable OF_CONTROL and SPL building for the
  microblaze-generic board

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

3 files changed, 58 insertions, 0 deletions

diff --git a/recipes-bsp/u-boot/u-boot-xlnx-2015.01.inc b/recipes-bsp/u-boot/u-boot-xlnx-2015.01.inc
index a0ac7551..8ee028ed 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx-2015.01.inc
+++ b/recipes-bsp/u-boot/u-boot-xlnx-2015.01.inc
@@ -5,6 +5,8 @@ PV = "v2015.01${XILINX_EXTENSION}+git${SRCPV}"
 FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:"
 SRC_URI += " \
                 file://zynq-Add-Zynq-PicoZed-board-support.patch \
+                file://microblaze-Fix-EMAC-Lite-initialization.patch \
+                file://microblaze-generic_defconfig-Disable-configs.patch \
                 "
 
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c"
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-Fix-EMAC-Lite-initialization.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-Fix-EMAC-Lite-initialization.patch
new file mode 100644
index 00000000..09c48fbc
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-Fix-EMAC-Lite-initialization.patch
@@ -0,0 +1,31 @@
+From 83f0e6e733aba458b9afac67f3c95c4e29712263 Mon Sep 17 00:00:00 2001
+From: Nathan Rossi <nathan.rossi@xilinx.com>
+Date: Tue, 14 Apr 2015 15:35:57 +1000
+Subject: [PATCH] microblaze: Fix EMAC Lite initialization
+
+It is possible for CONFIG_XILINX_EMACLITE to be defined without
+XILINX_EMACLITE_BASEADDR being defined as the EMAC Lite driver support
+OF init. Check that the driver is enabled and the base address is
+available before initializing with a static base address.
+
+Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
+---
+ board/xilinx/microblaze-generic/microblaze-generic.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
+index eee5f6b..8c926a2 100644
+--- a/board/xilinx/microblaze-generic/microblaze-generic.c
++++ b/board/xilinx/microblaze-generic/microblaze-generic.c
+@@ -63,7 +63,7 @@ int board_eth_init(bd_t *bis)
+                                                XILINX_AXIDMA_BASEADDR);
+ #endif
+ 
+-#ifdef CONFIG_XILINX_EMACLITE
++#if defined(CONFIG_XILINX_EMACLITE) && defined(XILINX_EMACLITE_BASEADDR)
+        u32 txpp = 0;
+        u32 rxpp = 0;
+ # ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
+-- 
+1.7.10.4
+
diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch
new file mode 100644
index 00000000..6de7b0e7
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch
@@ -0,0 +1,25 @@
+From 4955e7593d4d9b22761c0d1cac53d3f2ce7bc329 Mon Sep 17 00:00:00 2001
+From: Nathan Rossi <nathan.rossi@xilinx.com>
+Date: Mon, 20 Apr 2015 17:57:34 +1000
+Subject: [PATCH] microblaze-generic_defconfig: Disable configs
+
+Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
+Upstream-Status: Configuration
+---
+ configs/microblaze-generic_defconfig |    3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
+index 5cfd596..5ce5492 100644
+--- a/configs/microblaze-generic_defconfig
++++ b/configs/microblaze-generic_defconfig
+@@ -1,6 +1,3 @@
+-CONFIG_SPL=y
+ +S:CONFIG_MICROBLAZE=y
+ +S:CONFIG_TARGET_MICROBLAZE_GENERIC=y
+-CONFIG_OF_CONTROL=y
+-CONFIG_OF_EMBED=y
+ CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
+-- 
+1.7.10.4
+