diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-16 16:43:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-16 16:43:32 -0400 |
| commit | ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636 (patch) | |
| tree | c2c424ead06d5f265d6e4c954550454b9cf8c650 /scripts | |
| parent | 2808576491ae36b6ea96743005058f370d936beb (diff) | |
| parent | 9b6639fa85bddd90df4c371f25a89c791a6ee6ef (diff) | |
| download | u-boot-ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636.tar.gz u-boot-ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636.tar.xz u-boot-ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636.zip | |
Merge git://git.denx.de/u-boot-fsl-qoriq
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 f38e56cbe3..c4e5eb4691 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1163,7 +1163,6 @@ CONFIG_FSL_LAYERSCAPE CONFIG_FSL_LBC CONFIG_FSL_LINFLEXUART CONFIG_FSL_MC9SDZ60 -CONFIG_FSL_MC_ENET CONFIG_FSL_MEMAC CONFIG_FSL_NFC_CHIPS CONFIG_FSL_NFC_SPARE_SIZE @@ -4976,7 +4975,6 @@ CONFIG_SYS_MCKR_VAL CONFIG_SYS_MCLINK_MAX CONFIG_SYS_MCMEM0_VAL CONFIG_SYS_MCMEM1_VAL -CONFIG_SYS_MC_RSV_MEM_ALIGN CONFIG_SYS_MDC1_PIN CONFIG_SYS_MDCNFG_VAL CONFIG_SYS_MDC_PIN |