summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-01-24 15:30:06 -0500
committerTom Rini <trini@konsulko.com>2019-01-24 15:30:06 -0500
commit68489ed037530ec29fc0bc452ad6e4b0c5db02ec (patch)
treeb1fb961b98f1e9a5ab5c3f0dc80fcfc32e00e689 /scripts
parent0c3b301f79fcad081c8509ee4cb06e7b0478c8c1 (diff)
parent91c9cbabf935b37ab6c0b9b622e7faf0b350acb6 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e6ac098e27..d03ddd876f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1198,7 +1198,6 @@ CONFIG_MAX_FPGA_DEVICES
CONFIG_MAX_MEM_MAPPED
CONFIG_MAX_PKT
CONFIG_MAX_RAM_BANK_SIZE
-CONFIG_MCAST_TFTP
CONFIG_MCF5249
CONFIG_MCF5253
CONFIG_MCFFEC