diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-16 11:19:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-16 11:19:31 -0400 |
| commit | 0e80dda32c8d724c2a98dbbfb2f1e59762788f15 (patch) | |
| tree | a569b9b170c85a3bcae895c21c72def941ca9af9 /scripts | |
| parent | 9c94e0a64490b90d48995a8230499167c0bdca68 (diff) | |
| parent | f96238e253661b43168352010a2628957940bd4b (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
- Beelink-x2 STB support (Marcus)
- H6 DDR3, LPDDR3 changes (Andre, Jernej)
- H6 pin controller, USB PHY (Andre)
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 44c0396830..79872baeda 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1826,7 +1826,6 @@ CONFIG_STV0991 CONFIG_STV0991_HZ CONFIG_STV0991_HZ_CLOCK CONFIG_ST_SMI -CONFIG_SUNXI_GPIO CONFIG_SUNXI_MAX_FB_SIZE CONFIG_SUVD3 CONFIG_SXNI855T |