From 5553f000fc7820c0b0fea0dabf9b4dc1cf7099d4 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Mon, 19 Oct 2015 06:50:03 -0600
Subject: Revert "ARM: zynq: disable CONFIG_SYS_MALLOC_F to fix MMC boot"

This reverts commit 321f86e18d6aae9f7b7ba3ef1eb0cec769481874.

The original bug has been fixed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-on: Zedboard and ZC706 board
Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-on: zc702
Tested-by: Michal Simek <michal.simek@xilinx.com>
---
 configs/zynq_zc706_defconfig | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configs/zynq_zc706_defconfig')

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index f1009eebd3..d67f507390 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_TARGET_ZYNQ_ZC706=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
 CONFIG_SPL=y
-- 
cgit 


From 73193b01c5d7222d4be84091d105a10f58d02549 Mon Sep 17 00:00:00 2001
From: Jagan Teki <jteki@openedev.com>
Date: Mon, 31 Aug 2015 17:36:03 +0530
Subject: configs: Enable legacy SPI flash interface support

Enable legacy spi-flash interface support for boards which
supports qspi controller with connected spi-nor flash.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: Jagan Teki <jteki@openedev.com>
---
 configs/zynq_zc706_defconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configs/zynq_zc706_defconfig')

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index d67f507390..87158ab200 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -11,3 +11,4 @@ CONFIG_FIT_SIGNATURE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
-- 
cgit 


From 38a41675db949d86bfde2299a3eaebb4e105d8c1 Mon Sep 17 00:00:00 2001
From: Jagan Teki <jteki@openedev.com>
Date: Mon, 31 Aug 2015 17:38:40 +0530
Subject: configs: zynq: Enable zynq qspi controller

Enable zynq qspi controller driver on respective zynq boards.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: Jagan Teki <jteki@openedev.com>
---
 configs/zynq_zc706_defconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configs/zynq_zc706_defconfig')

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 87158ab200..b4c076ce44 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -12,3 +12,4 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_ZYNQ_QSPI=y
-- 
cgit