diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-05 12:25:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-05 12:25:39 -0400 |
| commit | abad176da14c576b5126484b03cba73a3b2c6f16 (patch) | |
| tree | 1baba7f9058acf8e41a043e6ce0f08dd1b94f644 /arch/arm/mach-at91/arm926ejs | |
| parent | 86f578ee85a697afb980233312f9aac1d98816df (diff) | |
| parent | 9337a08768dfa0a006382f1d05cf69b5f67f7844 (diff) | |
Merge branch '2019-05-05-master-imports'
- Various assorted fixes
- btrfs zstd compression support
- Enable hardware DDR levelling on am43xx platforms.
- pl310 cache controller driver
Diffstat (limited to 'arch/arm/mach-at91/arm926ejs')
| -rw-r--r-- | arch/arm/mach-at91/arm926ejs/u-boot-spl.lds | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds index 3955bea23a..74f6355229 100644 --- a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds +++ b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds @@ -52,11 +52,11 @@ SECTIONS } #if defined(IMAGE_MAX_SIZE) -ASSERT(__image_copy_end - __start < (IMAGE_MAX_SIZE), \ +ASSERT(__image_copy_end - __start <= (IMAGE_MAX_SIZE), \ "SPL image too big"); #endif #if defined(CONFIG_SPL_BSS_MAX_SIZE) -ASSERT(__bss_end - __bss_start < (CONFIG_SPL_BSS_MAX_SIZE), \ +ASSERT(__bss_end - __bss_start <= (CONFIG_SPL_BSS_MAX_SIZE), \ "SPL image BSS too big"); #endif |