From: Michal Simek Date: Thu, 4 Feb 2016 10:08:26 +0000 (+0100) Subject: ARM: zynq: Remove ZYNQ_BOOT_FREEBSD option X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d82d63cc9bc57952cefdd539f7d5c6e9da608cec;p=project%2Fbcm63xx%2Fu-boot.git 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 --- 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 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 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 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