summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-04-15 13:11:19 -0400
committerTom Rini <trini@konsulko.com>2021-04-15 13:11:19 -0400
commit45b3cf88da24206a6cb847efe837fddc120af3e8 (patch)
tree0c2054e1af2af9dc752205ec8ee003e4399045b5 /scripts
parentb86772eda6033ea795e42f5463d436057919b6be (diff)
parent20830d0c01b5d82c916010b5dfdbe099ca1f0444 (diff)
downloadu-boot-45b3cf88da24206a6cb847efe837fddc120af3e8.tar.gz
u-boot-45b3cf88da24206a6cb847efe837fddc120af3e8.tar.xz
u-boot-45b3cf88da24206a6cb847efe837fddc120af3e8.zip
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
update ls1028aqds networking protocol, config in ls1021atwr, env in ls1012a Add seli3 board support, booke watchdog, update eTSEC support in ppc-qemu Add DM_SERIAL and lpuart in sl28, add DM_ETH support for some of powerpc platforms Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
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 425a7ecb89..b24fa36da0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1339,7 +1339,6 @@ CONFIG_RESERVED_01_BASE
CONFIG_RESERVED_02_BASE
CONFIG_RESERVED_03_BASE
CONFIG_RESERVED_04_BASE
-CONFIG_RESET
CONFIG_RESET_PHY_R
CONFIG_RESET_TO_RETRY
CONFIG_RESET_VECTOR_ADDRESS