summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-12-18 08:08:55 -0500
committerTom Rini <[email protected]>2022-12-18 08:08:55 -0500
commit55e374f508da021cccc2fa90594ad147a1ba6c9d (patch)
tree8058a7380c55910cca074f7ccf0022d076fe8b7f /scripts
parent9bd3d354a1a0712ac27c717df9ad60566b0406ee (diff)
parent64531496f990c2a63211c72b953dfc084b4c2589 (diff)
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
This cleans up each board's defconfig, and fixes the serial console on some Olimex board. Also we lose another legacy config variable. The rest are minor cleanups, that actually shouldn't change anything in the build. Passed the gitlab CI, plus briefly tested on Pine64-LTS, LicheePi Nano, and BananaPi M1.
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 c0f55e41a50..ea71f9d2344 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -153,7 +153,6 @@ CONFIG_MISC_COMMON
CONFIG_MIU_2BIT_21_7_INTERLEAVED
CONFIG_MIU_2BIT_INTERLEAVED
CONFIG_MMC_DEFAULT_DEV
-CONFIG_MMC_SUNXI_SLOT
CONFIG_MONITOR_IS_IN_RAM
CONFIG_MPC85XX_FEC
CONFIG_MPC85XX_FEC_NAME