summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-12-24 08:18:19 -0500
committerTom Rini <trini@konsulko.com>2019-12-24 08:18:19 -0500
commit87f69f467a8335b171c71bf217d2625d515acd7c (patch)
treec46abf4bb357aa10d2d9a075ea7df63cbc2579aa /scripts
parentc0912f9bbfb26dd03d189953678691b799d35b6e (diff)
parent4466b99703197c6258aded7728eed7c292343a43 (diff)
downloadu-boot-87f69f467a8335b171c71bf217d2625d515acd7c.tar.gz
u-boot-87f69f467a8335b171c71bf217d2625d515acd7c.tar.xz
u-boot-87f69f467a8335b171c71bf217d2625d515acd7c.zip
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx into next
- Enable DM driver on ppc/km boards - Enable DM_USB for some of NXP powerpc platforms: P5040, T4240, T208x, T104x, P4080, P2041, P2020, P1020, P3041 - Some updates in mpc85xx-ddr driver, km boards
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cf1808e051..594e6b726d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -924,7 +924,6 @@ CONFIG_KMCOGE4
CONFIG_KMP204X
CONFIG_KMTEGR1
CONFIG_KM_BOARD_EXTRA_ENV
-CONFIG_KM_BOARD_NAME
CONFIG_KM_COGE5UN
CONFIG_KM_DEF_ARCH
CONFIG_KM_DEF_BOOT_ARGS_CPU
@@ -935,7 +934,6 @@ CONFIG_KM_DEF_ENV_BOOTTARGETS
CONFIG_KM_DEF_ENV_CONSTANTS
CONFIG_KM_DEF_ENV_CPU
CONFIG_KM_DEF_ENV_FLASH_BOOT
-CONFIG_KM_DEF_NETDEV
CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
CONFIG_KM_DISABLE_PCIE
CONFIG_KM_ECC_MODE