diff options
| author | Stefano Babic <sbabic@denx.de> | 2018-09-18 16:53:34 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2018-09-18 16:53:55 +0200 |
| commit | 0eee446ee811ea3ebbade82cb1d19558736e5603 (patch) | |
| tree | ec086d3b613610ff7c2b13cc092b38bc36d45c1f /scripts | |
| parent | d27748b7cb3b7f447ef7d7d7c6cfe91852cd14e6 (diff) | |
| parent | b57f1895b669e3fbdca486e7c40dfea00f22bb93 (diff) | |
| download | u-boot-0eee446ee811ea3ebbade82cb1d19558736e5603.tar.gz u-boot-0eee446ee811ea3ebbade82cb1d19558736e5603.tar.xz u-boot-0eee446ee811ea3ebbade82cb1d19558736e5603.zip | |
Merge branch 'master' of git://git.denx.de/u-boot into master
Signed-off-by: Stefano Babic <sbabic@denx.de>
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 30c79a643e..94953d8738 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4277,7 +4277,6 @@ CONFIG_SYS_TMRINTR_PEND CONFIG_SYS_TMRINTR_PRI CONFIG_SYS_TMRPND_REG CONFIG_SYS_TMR_BASE -CONFIG_SYS_TMU_CLK_DIV CONFIG_SYS_TSEC1 CONFIG_SYS_TSEC1_OFFSET CONFIG_SYS_TSEC2 |