Merge tag 'xilinx-for-v2019.07' of git://git.denx.de/u-boot-microblaze
Xilinx/FPGA changes for v2019.07 fpga: - Add support for external data in FIT - Extend testing for external data case - Inform user about a need to run post config on Zynq arm: - Tune zynq command functions - Fix internal variable setting arm64: - Add support for zc39dr decoding - Disable WDT for zcu100 - Small changes in reset_reason() - Some DT changes (spi) - Tune qspi-mini configuration - Remove useless eeprom setting - Fix two sdhci boot case spi: - Fix tap delay programming clk: - Enable i2c in SPL net: - Fix gem phydev handling - Remove phy detection code from gem driver general: - Correct EXT_DTB usage for MULTI_DTB_FIT configuration
This commit is contained in:
@@ -108,15 +108,6 @@
|
||||
# define PHY_ANEG_TIMEOUT 20000
|
||||
#endif
|
||||
|
||||
/* EEPROM */
|
||||
#ifdef CONFIG_ZYNQMP_EEPROM
|
||||
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
# define CONFIG_SYS_I2C_EEPROM_ADDR 0x54
|
||||
# define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
|
||||
# define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
# define CONFIG_SYS_EEPROM_SIZE (64 * 1024)
|
||||
#endif
|
||||
|
||||
#define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024)
|
||||
|
||||
#define CONFIG_CLOCKS
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
# define CONFIG_THOR_RESET_OFF
|
||||
# define DFU_ALT_INFO_RAM \
|
||||
"dfu_ram_info=" \
|
||||
"set dfu_alt_info " \
|
||||
"setenv dfu_alt_info " \
|
||||
"${kernel_image} ram 0x3000000 0x500000\\\\;" \
|
||||
"${devicetree_image} ram 0x2A00000 0x20000\\\\;" \
|
||||
"${ramdisk_image} ram 0x2000000 0x600000\0" \
|
||||
@@ -79,7 +79,7 @@
|
||||
# if defined(CONFIG_MMC_SDHCI_ZYNQ)
|
||||
# define DFU_ALT_INFO_MMC \
|
||||
"dfu_mmc_info=" \
|
||||
"set dfu_alt_info " \
|
||||
"setenv dfu_alt_info " \
|
||||
"${kernel_image} fat 0 1\\\\;" \
|
||||
"${devicetree_image} fat 0 1\\\\;" \
|
||||
"${ramdisk_image} fat 0 1\0" \
|
||||
@@ -227,9 +227,9 @@
|
||||
"env run importbootenv; " \
|
||||
"fi; " \
|
||||
"fi; \0" \
|
||||
"sd_loadbootenv=set bootenv_dev mmc && " \
|
||||
"sd_loadbootenv=setenv bootenv_dev mmc && " \
|
||||
"run setbootenv \0" \
|
||||
"usb_loadbootenv=set bootenv_dev usb && usb start && run setbootenv \0" \
|
||||
"usb_loadbootenv=setenv bootenv_dev usb && usb start && run setbootenv \0" \
|
||||
"preboot=if test $modeboot = sdboot; then " \
|
||||
"run sd_loadbootenv; " \
|
||||
"echo Checking if uenvcmd is set ...; " \
|
||||
|
||||
Reference in New Issue
Block a user