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 07c80afae19ce5dcc7929306d8d3192f0d3fe7dc..9355ea60c1d4cf196c2263887479ab098efee9d1 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -410,9 +410,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_cc108.h b/include/configs/zynq_cc108.h
index 70f6c4b21682a509290287c4ae49b148f0c1d966..1d13b402a34bd82b5fa9405c46df82f22d47a2fd 100644 (file)
--- a/include/configs/zynq_cc108.h
+++ b/include/configs/zynq_cc108.h
@@ -28,7 +28,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
 

diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index 47fad66acdde35dc503185a8c6cfd748b6365e52..6a7298797d628c6149232f6e15079d253c25850d 100644 (file)
--- a/include/configs/zynq_picozed.h
+++ b/include/configs/zynq_picozed.h
@@ -16,7 +16,6 @@
 
 #define CONFIG_ZYNQ_SDHCI1
 #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 c52a6552e78bc8495377886613a2bd1843102b19..e5e449afcacb0ac7b353210faf132d156109d055 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -18,7 +18,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 1488bfe165d9d5fbba8aeff709eb06eccfcd0670..8482b63a68c92197e8717f8cf6c46126408b1343 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -16,7 +16,6 @@
 
 #define CONFIG_ZYNQ_USB
 #define CONFIG_ZYNQ_SDHCI0
-#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 c53ba79d48b07ba8010ce3d5cae71b5f3091b27a..81382477bd0d03aa9c5a9e16065b736af22f0e4d 100644 (file)
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -17,7 +17,6 @@
 
 #define CONFIG_ZYNQ_USB
 #define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 /* Define ZYBO PS Clock Frequency to 50MHz */
 #define CONFIG_ZYNQ_PS_CLK_FREQ        50000000UL