diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-19 09:36:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-19 09:36:48 -0400 |
| commit | d3d212b6240f75006c18e4c59b3b28d81eedb7d3 (patch) | |
| tree | 106781344a5074a0e1cc26e8e371016cef0d0570 /common | |
| parent | 98b3156b0df4b0df9cb3a0bbfc240d0c4edd2638 (diff) | |
| parent | 612f6b223d2cb03ae0170d3eadcb78f7b473ecfb (diff) | |
Merge branch '2019-05-19-master-imports'
- Convert SYS_[DI]CACHE_OFF to Kconfig, introduce SPL variant.
- Various bcm96* fixes.
- Import include/android_bootloader_message.h from AOSP
- Assorted other small fixes.
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 2 | ||||
| -rw-r--r-- | common/lcd.c | 2 | ||||
| -rw-r--r-- | common/spl/spl.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/common/board_f.c b/common/board_f.c index 7ef20f20423..c25eb188fb2 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -381,7 +381,7 @@ static int reserve_round_4k(void) #ifdef CONFIG_ARM __weak int reserve_mmu(void) { -#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) +#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) /* reserve TLB table */ gd->arch.tlb_size = PGTABLE_SIZE; gd->relocaddr -= gd->arch.tlb_size; diff --git a/common/lcd.c b/common/lcd.c index cd630405d44..95526b1e17e 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -61,7 +61,7 @@ void lcd_sync(void) * architectures do not actually implement it. Is there a way to find * out whether it exists? For now, ARM is safe. */ -#if defined(CONFIG_ARM) && !defined(CONFIG_SYS_DCACHE_OFF) +#if defined(CONFIG_ARM) && !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) int line_length; if (lcd_flush_dcache) diff --git a/common/spl/spl.c b/common/spl/spl.c index 0a6a47c2020..4ddeff9b51e 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -195,10 +195,12 @@ static int spl_load_fit_image(struct spl_image_info *spl_image, #ifdef CONFIG_SPL_FIT_SIGNATURE images.verify = 1; #endif - fit_image_load(&images, (ulong)header, + ret = fit_image_load(&images, (ulong)header, &fit_uname_fdt, &fit_uname_config, IH_ARCH_DEFAULT, IH_TYPE_FLATDT, -1, FIT_LOAD_OPTIONAL, &dt_data, &dt_len); + if (ret >= 0) + spl_image->fdt_addr = (void *)dt_data; conf_noffset = fit_conf_get_node((const void *)header, fit_uname_config); |