diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-27 08:29:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-27 08:29:10 -0400 |
| commit | bbef20d479441b01d62252cf127498c58078b2c3 (patch) | |
| tree | 7818d7df29c6147d5270c0ee0a6ff1645917d1b6 /common | |
| parent | 0ae8dcfef7c890330c62bb34c724126ffc169bef (diff) | |
| parent | 3888c8d1979289efe685fe29276aed4d4b685975 (diff) | |
| download | u-boot-bbef20d479441b01d62252cf127498c58078b2c3.tar.gz u-boot-bbef20d479441b01d62252cf127498c58078b2c3.tar.bz2 u-boot-bbef20d479441b01d62252cf127498c58078b2c3.zip | |
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
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/common/Kconfig b/common/Kconfig index 3030da4fc9..be2e1b80f7 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -557,7 +557,7 @@ config VERSION_VARIABLE next reset. config BOARD_LATE_INIT - bool + bool "Execute Board late init" help Sometimes board require some initialization code that might require once the actual init done, example saving board specific env, diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index f08e5018c3..cb0cc5299b 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -257,10 +257,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, board_fit_image_post_process(&src, &length); #endif - if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && - IS_ENABLED(CONFIG_SPL_GZIP) && - image_comp == IH_COMP_GZIP && - type == IH_TYPE_KERNEL) { + if (IS_ENABLED(CONFIG_SPL_GZIP) && image_comp == IH_COMP_GZIP) { size = length; if (gunzip((void *)load_addr, CONFIG_SYS_BOOTM_LEN, src, &size)) { |