diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-12 08:29:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-12 08:29:42 -0400 |
| commit | 711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab (patch) | |
| tree | 4982ebe5c4ed6d1e28e110f17f2ca09e388d9ba1 /scripts | |
| parent | 8435179271106ec6fe9a9a5679b897755b1db8dd (diff) | |
| parent | 76379dfb7e7e5092f32c79897bb58c19979e576b (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1021aqds.h
include/configs/ls1021atwr.h
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3621c91c92..04e9536d36 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1294,8 +1294,6 @@ CONFIG_FSL_LAW CONFIG_FSL_LAYERSCAPE CONFIG_FSL_LBC CONFIG_FSL_LINFLEXUART -CONFIG_FSL_LSCH2 -CONFIG_FSL_LSCH3 CONFIG_FSL_LS_PPA CONFIG_FSL_MC9SDZ60 CONFIG_FSL_MC_ENET |