diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-11 18:09:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-11 18:09:38 -0400 |
| commit | 68deea2308141c26707da44654b273d7b072ab0d (patch) | |
| tree | 1af260ebb9b053457bd6bf388510fa0475c3be16 /scripts | |
| parent | 79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce (diff) | |
| parent | cc66ebdeeca5c4ed095bbd521b748bb009d99728 (diff) | |
| download | u-boot-68deea2308141c26707da44654b273d7b072ab0d.tar.gz u-boot-68deea2308141c26707da44654b273d7b072ab0d.tar.xz u-boot-68deea2308141c26707da44654b273d7b072ab0d.zip | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- SPL SATA enhancements to allow booting from RAW SATA device
needed for Clearfog (Baruch)
- Enable SATA booting on Clearfog (Baruch)
- Misc changes to Turris Omnia (Marek)
- Enable CMD_BOOTZ and increase SYS_BOOTM_LEN on crs305-1g-4s
(Luka)
- Enable FIT support for db-xc3-24g4xg (Chris)
- Enable DM_SPI on Keymile Kirkwood board with necessary changes
for this (Pascal)
- Set 38x and 39x AVS on lower frequency (Baruch)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2fc77b77c2..2c9cfb450d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3066,7 +3066,6 @@ CONFIG_SYS_JFFS2_SORT_FRAGMENTS CONFIG_SYS_KMBEC_FPGA_BASE CONFIG_SYS_KMBEC_FPGA_SIZE CONFIG_SYS_KWD_CONFIG -CONFIG_SYS_KW_SPI_MPP CONFIG_SYS_L2 CONFIG_SYS_L2_PL310 CONFIG_SYS_L2_SIZE |