Merge tag 'xilinx-for-v2018.11' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.11 - Handle BOARD_LATE_INIT via Kconfig SPL: - Enable GZIP for all partitions types(not only for kernel) ZynqMP: - Rearrange pmufw version handling - Support newer PMUFW with improved fpga load sequence Zynq: - Cleanup config file - Simplify zybo config by enabling option via Kconfig net: - Fix gems max-speed property reading - Enable support for fixed-link phys
This commit is contained in:
@@ -24,7 +24,6 @@
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
#undef CONFIG_BOOTM_VXWORKS
|
||||
#undef CONFIG_BOOTM_LINUX
|
||||
#undef CONFIG_BOARD_LATE_INIT
|
||||
|
||||
/* BOOTP options */
|
||||
#undef CONFIG_BOOTP_BOOTFILESIZE
|
||||
|
||||
@@ -127,8 +127,6 @@
|
||||
/* Boot configuration */
|
||||
#define CONFIG_SYS_LOAD_ADDR 0 /* default? */
|
||||
|
||||
/* Distro boot enablement */
|
||||
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
#define BOOTENV
|
||||
#else
|
||||
@@ -244,10 +242,6 @@
|
||||
|
||||
#define CONFIG_SYS_LDSCRIPT "arch/arm/mach-zynq/u-boot.lds"
|
||||
|
||||
/* Commands */
|
||||
|
||||
/* SPL part */
|
||||
|
||||
/* MMC support */
|
||||
#ifdef CONFIG_MMC_SDHCI_ZYNQ
|
||||
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
|
||||
@@ -279,8 +273,6 @@
|
||||
CONFIG_SYS_SPI_ARGS_SIZE)
|
||||
#endif
|
||||
|
||||
/* for booting directly linux */
|
||||
|
||||
/* SP location before relocation, must use scratch RAM */
|
||||
#define CONFIG_SPL_TEXT_BASE 0x0
|
||||
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
/* Undef unneeded configs */
|
||||
#undef CONFIG_EXTRA_ENV_SETTINGS
|
||||
#undef CONFIG_BOARD_LATE_INIT
|
||||
#undef CONFIG_ZLIB
|
||||
#undef CONFIG_GZIP
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@
|
||||
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50
|
||||
#define CONFIG_DISPLAY
|
||||
#define CONFIG_I2C_EDID
|
||||
|
||||
#include <configs/zynq-common.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user