diff options
| author | Tom Rini | 2018-10-25 09:16:21 -0500 |
|---|---|---|
| committer | Tom Rini | 2018-10-25 09:16:21 -0500 |
| commit | cf033e04da315ba949e804c127abae0134bda30f (patch) | |
| tree | 77100d0a1c7ac1ce879509df57b845184f058550 /scripts | |
| parent | 1ed3c0954bd160dafcad8847a51c3ddd5f992f51 (diff) | |
| parent | 3c28576bb0f0990d699fd330089412e620706941 (diff) | |
| download | u-boot-cf033e04da315ba949e804c127abae0134bda30f.tar.gz u-boot-cf033e04da315ba949e804c127abae0134bda30f.tar.xz u-boot-cf033e04da315ba949e804c127abae0134bda30f.zip | |
Merge tag 'u-boot-imx-20181025' of git://git.denx.de/u-boot-imx
Merged imx8 architecture, fix build for imx8 + warnings
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 2126315460..94c0f1ff82 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt | |||
| @@ -310,7 +310,6 @@ CONFIG_D2NET_V2 | |||
| 310 | CONFIG_DA850_AM18X_EVM | 310 | CONFIG_DA850_AM18X_EVM |
| 311 | CONFIG_DA850_EVM_MAX_CPU_CLK | 311 | CONFIG_DA850_EVM_MAX_CPU_CLK |
| 312 | CONFIG_DBGU | 312 | CONFIG_DBGU |
| 313 | CONFIG_DBG_MONITOR | ||
| 314 | CONFIG_DB_784MP_GP | 313 | CONFIG_DB_784MP_GP |
| 315 | CONFIG_DCACHE | 314 | CONFIG_DCACHE |
| 316 | CONFIG_DCACHE_OFF | 315 | CONFIG_DCACHE_OFF |
| @@ -962,7 +961,6 @@ CONFIG_IMX_HDMI | |||
| 962 | CONFIG_IMX_NAND | 961 | CONFIG_IMX_NAND |
| 963 | CONFIG_IMX_OTP | 962 | CONFIG_IMX_OTP |
| 964 | CONFIG_IMX_VIDEO_SKIP | 963 | CONFIG_IMX_VIDEO_SKIP |
| 965 | CONFIG_IMX_WATCHDOG | ||
| 966 | CONFIG_INETSPACE_V2 | 964 | CONFIG_INETSPACE_V2 |
| 967 | CONFIG_INITRD_TAG | 965 | CONFIG_INITRD_TAG |
| 968 | CONFIG_INIT_CRITICAL | 966 | CONFIG_INIT_CRITICAL |