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.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb19bd7ad1b868159032e9b0c58d654069bffd7c;p=thirdparty%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 07c80afae19..9355ea60c1d 100644 --- 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 70f6c4b2168..1d13b402a34 100644 --- 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 diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h index 47fad66acdd..6a7298797d6 100644 --- 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 diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index c52a6552e78..e5e449afcac 100644 --- 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 diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 1488bfe165d..8482b63a68c 100644 --- 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 diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index c53ba79d48b..81382477bd0 100644 --- 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