]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...
authorTom Rini <trini@konsulko.com>
Thu, 30 Apr 2020 15:31:33 +0000 (11:31 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 30 Apr 2020 15:34:01 +0000 (11:34 -0400)
Xilinx changes for v2020.07-rc2

mmc:
- Fix dt property handling via generic function

clk:
- Fix versal watchdog clock setting

nand:
- Fix zynq nand command comparison

xilinx:
- Enable ubifs
- Sync board_late_init configurations with initrd_high setup
- Make custom distro boot more verbose

zynq:
- Kconfig alignments
- Fix nand cse configuration

zynqmp:
- Fix zcu104 low level qspi configuration
- Small DT updates

Signed-off-by: Tom Rini <trini@konsulko.com>
1  2 
configs/xilinx_zynq_virt_defconfig
configs/zynq_cse_nand_defconfig

Simple merge
index 19491c9e47eb7ce1b40ba6ccda68333f3b9edcdd,80a427d905d3bcab5eea390c98d6feaaf5ff5b66..6a01da2e4e1f263c3746042abbb4a8feaa400b09
@@@ -4,8 -4,8 +4,8 @@@ CONFIG_SYS_ICACHE_OFF=
  CONFIG_SYS_DCACHE_OFF=y
  CONFIG_ARCH_ZYNQ=y
  CONFIG_SYS_TEXT_BASE=0x100000
 -CONFIG_SYS_MALLOC_LEN=0x8000
  CONFIG_ENV_SIZE=0x190
- CONFIG_SYS_MALLOC_LEN=0x1000
++CONFIG_SYS_MALLOC_LEN=0x8000
  CONFIG_SPL_STACK_R_ADDR=0x200000
  CONFIG_SPL=y
  CONFIG_SYS_CUSTOM_LDSCRIPT=y