diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-08 07:32:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-08 07:32:54 -0400 |
| commit | 8246654e1ef3ea9e2907a42e01b7747ccc62d412 (patch) | |
| tree | f3b495e89b3cb3fb23e16ee0c995244907dbf606 /scripts | |
| parent | e9c99db7787e3b5c2ef05701177c43ed1c023c27 (diff) | |
| parent | b5293df17a2c9239e92c8024484cd3ad3ed55f00 (diff) | |
| download | u-boot-8246654e1ef3ea9e2907a42e01b7747ccc62d412.tar.gz u-boot-8246654e1ef3ea9e2907a42e01b7747ccc62d412.tar.xz u-boot-8246654e1ef3ea9e2907a42e01b7747ccc62d412.zip | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Add Armada 38x RTC driver (Marek)
- turris_omnia: Misc updates (enable RTC and other cmds) (Marek)
- ds414: Misc updates (enable XHCI_PCI USB support etc) (Phil)
- Convert MVEBU MMC driver to DM (Harm)
- kirkwood: Misc updates and cleanups to some boards (Harm)
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 b693925d20..6859d17654 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1076,7 +1076,6 @@ CONFIG_MTD_UBI_GLUEBI CONFIG_MTD_UBI_MODULE CONFIG_MULTI_CS CONFIG_MUSB_HOST -CONFIG_MVEBU_MMC CONFIG_MVGBE_PORTS CONFIG_MVMFP_V2 CONFIG_MVS @@ -2906,7 +2905,6 @@ CONFIG_SYS_MIPS_TIMER_FREQ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR -CONFIG_SYS_MMC_BASE CONFIG_SYS_MMC_CD_PIN CONFIG_SYS_MMC_CLK_OD CONFIG_SYS_MMC_MAX_BLK_COUNT |