summaryrefslogtreecommitdiffstats
path: root/include/configs
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-02-04 11:08:26 +0100
committerMichal Simek <michal.simek@xilinx.com>2016-02-22 16:21:03 +0100
commitd82d63cc9bc57952cefdd539f7d5c6e9da608cec (patch)
treee6c10278422910ee8ceb154c5084de56a7a6b04c /include/configs
parentd9f317fd0d46beebeeeb5be8f3c7d925ed6174fd (diff)
downloadblackbird-obmc-uboot-d82d63cc9bc57952cefdd539f7d5c6e9da608cec.tar.gz
blackbird-obmc-uboot-d82d63cc9bc57952cefdd539f7d5c6e9da608cec.zip
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/zynq-common.h4
-rw-r--r--include/configs/zynq_picozed.h1
-rw-r--r--include/configs/zynq_zc70x.h1
-rw-r--r--include/configs/zynq_zed.h1
-rw-r--r--include/configs/zynq_zybo.h1
5 files changed, 1 insertions, 7 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1fa34163ef..6fcbff5c7e 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 1fc57e1e0f..adc4d0f11e 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 2e7056ab1f..8a045900f6 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 6f3915a0f8..150cb4a0df 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 5287512d18..eab05fd1a3 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
OpenPOWER on IntegriCloud