diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-03 07:30:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-03 07:30:55 -0400 |
| commit | b362fe0848df60569bdb867b7627151747eb6e23 (patch) | |
| tree | 0c520eed4b77f93e2f1ad872db8445ca0e859ead /scripts | |
| parent | 6e25cfe9a475e8177bad7d9f97cffead6aab6b0d (diff) | |
| parent | cd22e34c11e7211c54d31f854672fa26185990a5 (diff) | |
Merge branch '2019-05-03-master-imports'
- Various btrfs fixes
- Various TI platform fixes
- Other fixes (cross build, taurus update, Kconfig help text)
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 c450e1157a..48ef03149e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -118,7 +118,6 @@ CONFIG_BMP_32BPP CONFIG_BOARDDIR CONFIG_BOARDNAME CONFIG_BOARDNAME_LOCAL -CONFIG_BOARD_AXM CONFIG_BOARD_COMMON CONFIG_BOARD_ECC_SUPPORT CONFIG_BOARD_IS_OPENRD_BASE @@ -128,7 +127,6 @@ CONFIG_BOARD_NAME CONFIG_BOARD_POSTCLK_INIT CONFIG_BOARD_REVISION_TAG CONFIG_BOARD_SIZE_LIMIT -CONFIG_BOARD_TAURUS CONFIG_BOOGER CONFIG_BOOTBLOCK CONFIG_BOOTFILE |