Merge tag 'efi-2020-01-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efiWIP/01Nov2020

Pull request for UEFI sub-system for efi-2021-01-rc2 (2)

The series contains the following enhancements

* preparatory patches for UEFI capsule updates
* initialization of the emulated RTC using an environment variable

and a bug fix

* If DisconnectController() is called for a child controller that is the
  only child of the driver, the driver must be disconnected.

2 files changed, 30 insertions, 11 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index d06d272..cad667a 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -68,11 +68,14 @@ config RTC_EMULATION
 	depends on DM_RTC
 	help
 	  On a board without hardware clock this software real time clock can be
-	  used. The build time is used to initialize the RTC. So you will have
-	  to adjust the time either manually using the 'date' command  or use
-	  the 'sntp' to update the RTC with the time from a network time server.
-	  See CONFIG_CMD_SNTP and CONFIG_BOOTP_NTPSERVER. The RTC time is
-	  advanced according to CPU ticks.
+	  used. The initial time may be provided via the environment variable
+	  'rtc_emul_epoch' as a decimal string indicating seconds since
+	  1970-01-01. If the environment variable is missing, the build time is
+	  used to initialize the RTC. The time can be adjusted manually via the
+	  'date' command or the 'sntp' command can be used to update the RTC
+	  with the time from a network time server. See CONFIG_CMD_SNTP and
+	  CONFIG_BOOTP_NTPSERVER. The RTC time is advanced according to CPU
+	  ticks.
 
 config RTC_ISL1208
 	bool "Enable ISL1208 driver"
diff --git a/drivers/rtc/emul_rtc.c b/drivers/rtc/emul_rtc.c
index c98c24b..7e52210 100644
--- a/drivers/rtc/emul_rtc.c
+++ b/drivers/rtc/emul_rtc.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <div64.h>
 #include <dm.h>
+#include <env.h>
 #include <generated/timestamp_autogenerated.h>
 #include <rtc.h>
 
@@ -30,12 +31,6 @@ static int emul_rtc_get(struct udevice *dev, struct rtc_time *time)
 	struct emul_rtc *priv = dev_get_priv(dev);
 	u64 now;
 
-	if (!priv->offset_us) {
-		/* Use the build date as initial time */
-		priv->offset_us = U_BOOT_EPOCH * 1000000ULL - timer_get_us();
-		priv->isdst = -1;
-	}
-
 	now = timer_get_us() + priv->offset_us;
 	do_div(now, 1000000);
 	rtc_to_tm(now, time);
@@ -63,6 +58,26 @@ static int emul_rtc_set(struct udevice *dev, const struct rtc_time *time)
 	return 0;
 }
 
+int emul_rtc_probe(struct udevice *dev)
+{
+	struct emul_rtc *priv = dev_get_priv(dev);
+	const char *epoch_str;
+	u64 epoch;
+
+	epoch_str = env_get("rtc_emul_epoch");
+
+	if (epoch_str) {
+		epoch = simple_strtoull(epoch_str, NULL, 10);
+	} else {
+		/* Use the build date as initial time */
+		epoch = U_BOOT_EPOCH;
+	}
+	priv->offset_us = epoch * 1000000ULL - timer_get_us();
+	priv->isdst = -1;
+
+	return 0;
+}
+
 static const struct rtc_ops emul_rtc_ops = {
 	.get = emul_rtc_get,
 	.set = emul_rtc_set,
@@ -72,6 +87,7 @@ U_BOOT_DRIVER(rtc_emul) = {
 	.name	= "rtc_emul",
 	.id	= UCLASS_RTC,
 	.ops	= &emul_rtc_ops,
+	.probe	= emul_rtc_probe,
 	.priv_auto_alloc_size = sizeof(struct emul_rtc),
 };