diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
| commit | ef2f0d323652c1162937df668b33b3bfe0ca3904 (patch) | |
| tree | f957b7e9edcf79403f8a582d17dc4103f293fc10 /scripts/config_whitelist.txt | |
| parent | c00bd81ae0d6eb1f94e26b31be3a64cadaa05bcb (diff) | |
| parent | 4f731c795d75aee548f6886f4f0da0a49a99354d (diff) | |
Merge branch '2020-01-10-master-imports'
- Android image support enhancements
- Assorted ARM fixes and enhancements
- m68k update
Diffstat (limited to 'scripts/config_whitelist.txt')
| -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 9f5d173820..cd154738a4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -939,7 +939,6 @@ CONFIG_KM_ECC_MODE CONFIG_KM_KIRKWOOD CONFIG_KM_KIRKWOOD_128M16 CONFIG_KM_KIRKWOOD_PCI -CONFIG_KM_MGCOGE3UN CONFIG_KM_NEW_ENV CONFIG_KM_NUSA CONFIG_KM_ROOTFSSIZE @@ -1081,7 +1080,6 @@ CONFIG_MAX_RAM_BANK_SIZE CONFIG_MCF5249 CONFIG_MCF5253 CONFIG_MCFFEC -CONFIG_MCFPIT CONFIG_MCFRTC CONFIG_MCFTMR CONFIG_MCLK_DIS |