diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-18 11:34:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-18 11:34:49 -0400 |
| commit | 49cf75101db58ad3540d8de6749cf0c1d780dc76 (patch) | |
| tree | 786092a426377f81838509ada3d8c064bd58d8a6 /scripts | |
| parent | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (diff) | |
| parent | 5fef24c912a44a08ab644aa16ceb5a435491f9d9 (diff) | |
| download | u-boot-49cf75101db58ad3540d8de6749cf0c1d780dc76.tar.gz u-boot-49cf75101db58ad3540d8de6749cf0c1d780dc76.tar.xz u-boot-49cf75101db58ad3540d8de6749cf0c1d780dc76.zip | |
Merge tag 'mips-pull-2020-07-18' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips
- MIPS: refactor cache init and setup in start.S
- MIPS: sync asm header files with Linux 5.7
- MIPS: add initial support for Marvell Octeon MIPS64
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1602b05f07..2ec7642583 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -228,7 +228,6 @@ CONFIG_CPLD_BR_PRELIM CONFIG_CPLD_OR_PRELIM CONFIG_CPM2 CONFIG_CPU_ARMV8 -CONFIG_CPU_CAVIUM_OCTEON CONFIG_CPU_FREQ_HZ CONFIG_CPU_HAS_LLSC CONFIG_CPU_HAS_PREFETCH |