projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT
[oweals/u-boot.git]
/
include
/
configs
/
zynq-common.h
diff --git
a/include/configs/zynq-common.h
b/include/configs/zynq-common.h
index 143dc7bb22471a257cebc402a9f6284823eaf4d9..364ffbc1b9643bc1cbbc8d097a48b8f86ae283c4 100644
(file)
--- a/
include/configs/zynq-common.h
+++ b/
include/configs/zynq-common.h
@@
-65,7
+65,6
@@
# define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000
# define DFU_DEFAULT_POLL_TIMEOUT 300
# define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000
# define DFU_DEFAULT_POLL_TIMEOUT 300
-# define CONFIG_USB_CABLE_CHECK
# define CONFIG_THOR_RESET_OFF
# define DFU_ALT_INFO_RAM \
"dfu_ram_info=" \
# define CONFIG_THOR_RESET_OFF
# define DFU_ALT_INFO_RAM \
"dfu_ram_info=" \
@@
-103,6
+102,7
@@
#define CONFIG_ENV_OVERWRITE
/* enable preboot to be loaded before CONFIG_BOOTDELAY */
#define CONFIG_ENV_OVERWRITE
/* enable preboot to be loaded before CONFIG_BOOTDELAY */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/* Boot configuration */
#define CONFIG_PREBOOT
/* Boot configuration */
@@
-276,8
+276,6
@@
/* Boot FreeBSD/vxWorks from an ELF image */
#define CONFIG_SYS_MMC_MAX_DEVICE 1
/* Boot FreeBSD/vxWorks from an ELF image */
#define CONFIG_SYS_MMC_MAX_DEVICE 1
-#define CONFIG_SYS_LDSCRIPT "arch/arm/mach-zynq/u-boot.lds"
-
/* MMC support */
#ifdef CONFIG_MMC_SDHCI_ZYNQ
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
/* MMC support */
#ifdef CONFIG_MMC_SDHCI_ZYNQ
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1