[U-Boot] [PATCH 4/4] ARM: zynq: Remove ZYNQ_BOOT_FREEBSD option

[Michal Simek]

Remove CONFIG_ZYNQ_BOOT_FREEBSD configuration option and setup
CONFIG_SYS_MMC_MAX_DEVICE 1 for all Zynq boards.

Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 include/configs/zynq-common.h  | 4 +---
 include/configs/zynq_picozed.h | 1 -
 include/configs/zynq_zc70x.h   | 1 -
 include/configs/zynq_zed.h     | 1 -
 include/configs/zynq_zybo.h    | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1fa34163ef8b..6fcbff5c7e4e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -287,9 +287,7 @@
 #define CONFIG_SYS_BOOTM_LEN	(60 * 1024 * 1024)
 
 /* Boot FreeBSD/vxWorks from an ELF image */
-#if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
-# define CONFIG_SYS_MMC_MAX_DEVICE	1
-#endif
+#define CONFIG_SYS_MMC_MAX_DEVICE	1
 
 #define CONFIG_SYS_LDSCRIPT  "arch/arm/mach-zynq/u-boot.lds"
 
diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index 1fc57e1e0fca..adc4d0f11e67 100644
--- a/include/configs/zynq_picozed.h
+++ b/include/configs/zynq_picozed.h
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
 
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 2e7056ab1ff0..8a045900f62d 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -15,7 +15,6 @@
 #define CONFIG_ZYNQ_USB
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
 
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 6f3915a0f86a..150cb4a0df97 100644
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
 
diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 5287512d185c..eab05fd1a3b1 100644
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -14,7 +14,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 /* Define ZYBO PS Clock Frequency to 50MHz */
 #define CONFIG_ZYNQ_PS_CLK_FREQ	50000000UL
-- 
1.9.1