diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-02-04 10:08:26 (GMT) |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-02-22 15:21:03 (GMT) |
| commit | d82d63cc9bc57952cefdd539f7d5c6e9da608cec (patch) | |
| tree | e6c10278422910ee8ceb154c5084de56a7a6b04c | |
| parent | d9f317fd0d46beebeeeb5be8f3c7d925ed6174fd (diff) | |
| download | u-boot-d82d63cc9bc57952cefdd539f7d5c6e9da608cec.tar.xz | |
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>
| -rw-r--r-- | include/configs/zynq-common.h | 4 | ||||
| -rw-r--r-- | include/configs/zynq_picozed.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq_zc70x.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq_zed.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq_zybo.h | 1 |
5 files changed, 1 insertions, 7 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 1fa3416..6fcbff5 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 1fc57e1..adc4d0f 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 2e7056a..8a04590 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 6f3915a..150cb4a 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 5287512..eab05fd 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 |