ARM: zynq: Remove ZYNQ_BOOT_FREEBSD option

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@xilinx.com>

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1fa34163ef8b69765a43c5f7f2038419f219e8a4..6fcbff5c7e4ee3ef0f6bb78ba94fa2e17c6eeb35 100644 (file)
--- 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 1fc57e1e0fca58e48b429388bd266e9d031c00e0..adc4d0f11e675199fbf3e6ca5d4de11c4749e9e4 100644 (file)
--- 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 2e7056ab1ff0d80220f6a96a3a7cd8af2116286e..8a045900f62dce7af24a46593b4a49ca7e190f9a 100644 (file)
--- 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 6f3915a0f86a3035dd74cf9dd6aa5a1a014c6984..150cb4a0df9733003ff3f7620dd4655d7994af8e 100644 (file)
--- 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 5287512d185cc09508c8ca45e0cb7531710651a6..eab05fd1a3b133547022913a5f7b1101a9195b85 100644 (file)
--- 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