1 files changed, 25 insertions, 8 deletions

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
index 6de7b0e7..316d89af 100644
--- 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
@@ -1,4 +1,3 @@
-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
@@ -6,20 +5,38 @@ 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(-)
+ configs/microblaze-generic_defconfig | 4 +---
+ include/configs/microblaze-generic.h | 5 +++++
+ 2 files changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
-index 5cfd596..5ce5492 100644
+index 4211d71..69b8023 100644
 --- a/configs/microblaze-generic_defconfig
 +++ b/configs/microblaze-generic_defconfig
-@@ -1,6 +1,3 @@
+@@ -1,6 +1,4 @@
 -CONFIG_SPL=y
- +S:CONFIG_MICROBLAZE=y
- +S:CONFIG_TARGET_MICROBLAZE_GENERIC=y
+ CONFIG_MICROBLAZE=y
+ CONFIG_TARGET_MICROBLAZE_GENERIC=y
 -CONFIG_OF_CONTROL=y
 -CONFIG_OF_EMBED=y
  CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
++CONFIG_SYS_BOOTM_LEN=33554432
+diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
+index 073f3ef..26e85c7 100644
+--- a/include/configs/microblaze-generic.h
++++ b/include/configs/microblaze-generic.h
+@@ -219,6 +219,11 @@
+ #endif
+ 
+ /*
++ * BOOTM options
++ */
++#define CONFIG_SYS_BOOTM_LEN (32 * 1024 * 1024)
++
++/*
+  * BOOTP options
+  */
+ #define CONFIG_BOOTP_BOOTFILESIZE
 -- 
-1.7.10.4
+2.5.1