diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-18 13:40:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-18 13:40:41 -0500 |
| commit | c4d323793ba2e0616d93ca104e1e2b9a9fbccf9b (patch) | |
| tree | a79b7b8282e29e820022d037b6f6f2c1d5d52c0d /common | |
| parent | f83ef0dac83110d20389eb71f09285f009f3d198 (diff) | |
| parent | 3d5931e5986a49c44cdab845c6751d845812e8d8 (diff) | |
Merge branch '2019-01-18-master-imports'
- Bugfix for SPI environment optimization
- Spelling fixes
- Remove some defconfigs per various maintainers
- Minor db410, bananapi r2 fixes
- Bump QEMU to v3.1.0 for most platforms
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 37ecbc6b1c..d175bb6cff 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -608,7 +608,7 @@ config SPL_PAYLOAD default "tpl/u-boot-with-tpl.bin" if TPL default "u-boot.bin" help - Payload for SPL boot. For backward compability, default to + Payload for SPL boot. For backward compatibility, default to u-boot.bin, i.e. RAW image without any header. In case of TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to use u-boot.img. |