From fe1c3cd3af220bf2522db726564661e5553b6767 Mon Sep 17 00:00:00 2001
From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Date: Fri, 28 Jul 2017 18:00:27 +0200
Subject: [PATCH] rockchip: lion-rk3368: defconfig: enable DM timer for all
 stages

There is no reasonably robust way (this will be needed so early that
diagnostics will be limited) to specify the base-address of the secure
timer through the DTS for TPL and SPL.  In order to allow us a cleaner
way to structure our SPL and TPL stage, we now move to a DM timer
driver.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 board/theobroma-systems/lion_rk3368/fit_spl_atf.its | 2 +-
 configs/lion-rk3368_defconfig                       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/board/theobroma-systems/lion_rk3368/fit_spl_atf.its b/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
index e7d98b9f35..405750f351 100644
--- a/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
+++ b/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
@@ -45,7 +45,7 @@
 			description = "Theobroma Systems RK3368-uQ7 (Puma) SoM";
 			firmware = "uboot";
 			loadables = "atf";
- 			fdt = "fdt";
+			fdt = "fdt";
 		};
 	};
 };
diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig
index 92058b3d2b..f37bac188b 100644
--- a/configs/lion-rk3368_defconfig
+++ b/configs/lion-rk3368_defconfig
@@ -85,6 +85,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
+CONFIG_TIMER=y
+CONFIG_SPL_TIMER=y
+CONFIG_TPL_TIMER=y
+CONFIG_ROCKCHIP_TIMER=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_LZO=y
-- 
2.39.5