summaryrefslogtreecommitdiff
path: root/include/configs/warp.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-10-25 10:16:21 -0400
committerTom Rini <trini@konsulko.com>2018-10-25 10:16:21 -0400
commitcf033e04da315ba949e804c127abae0134bda30f (patch)
tree77100d0a1c7ac1ce879509df57b845184f058550 /include/configs/warp.h
parent1ed3c0954bd160dafcad8847a51c3ddd5f992f51 (diff)
parent3c28576bb0f0990d699fd330089412e620706941 (diff)
downloadu-boot-cf033e04da315ba949e804c127abae0134bda30f.tar.gz
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 'include/configs/warp.h')
-rw-r--r--include/configs/warp.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/warp.h b/include/configs/warp.h
index f9c095dad3..9aa8a48d3d 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -26,8 +26,6 @@
#define CONFIG_SUPPORT_EMMC_BOOT
/* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
#define CONFIG_SYS_MEMTEST_START 0x80000000