diff options
| author | Tom Rini <[email protected]> | 2020-07-10 14:30:46 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-07-10 14:30:46 -0400 |
| commit | 618c30679086e0b6d74e427b52931a31a2767af6 (patch) | |
| tree | 61af852fc7f4c4a7a673f21aeaa061cc358dda09 /scripts | |
| parent | 506d52308a2f5de48c2b9a08229fee9a0ee2842a (diff) | |
| parent | c1b0bcc870285b6f92d33d8bbb10fb5ba901fb42 (diff) | |
Merge branch '2020-08-10-arbitrary-virt-phys-mappings'
- Bring in Marek Szyprowski's series to allow for arbitrary
virtual-physical address mappings.
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 e57548c1ec7..0547e22af64 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -15,7 +15,6 @@ CONFIG_ACX517AKN CONFIG_ACX544AKN CONFIG_ADDRESS CONFIG_ADDR_AUTO_INCR_BIT -CONFIG_ADDR_MAP CONFIG_ADNPESC1 CONFIG_AEABI CONFIG_AEMIF_CNTRL_BASE @@ -3266,7 +3265,6 @@ CONFIG_SYS_NS16550_MEM32 CONFIG_SYS_NS16550_PORT_MAPPED CONFIG_SYS_NS16550_REG_SIZE CONFIG_SYS_NS16550_SERIAL -CONFIG_SYS_NUM_ADDR_MAP CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_FM1_10GEC CONFIG_SYS_NUM_FM1_DTSEC |
