diff options
| author | Tom Rini <[email protected]> | 2021-07-31 08:18:14 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-07-31 08:18:14 -0400 |
| commit | 85769006fce951d0ebf61585ae0ab6b7d880735d (patch) | |
| tree | 12a2b59bf6475489ce9d20ba79b65dc26286b1fa /scripts | |
| parent | 15f7e0dc01d8a851fb1bfbf0e47eab5b67ed26b3 (diff) | |
| parent | 2cc4be280c259ac1e8e74c643c72e0331266056f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- kwboot / kwbimage improvements reducing image size (Pali & Marek)
- a37xx: pinctrl: Correct PWM pins definitions (Marek)
- Convert the Dreamplug Ethernet and SATA to Driver Model (Tony)
- serial: a37xx: DEBUG_UART improvements / fixes (Pali)
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 66678cf2a24..812d8f2836f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3271,7 +3271,6 @@ CONFIG_SYS_USE_NAND CONFIG_SYS_USE_NANDFLASH CONFIG_SYS_USE_NORFLASH CONFIG_SYS_USR_EXCEP -CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT |