diff options
| author | Tom Rini <[email protected]> | 2021-07-13 09:42:19 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-07-13 09:42:19 -0400 |
| commit | a7bdd2dd8e7685166767c5fecfdce7e5dc8a40be (patch) | |
| tree | b4b167b47aa3e4934734d75f62c9a7e5b94a91d5 /lib/date.c | |
| parent | 490101a5e5df65238b900b21b81361bc4b13da2e (diff) | |
| parent | b0b1449b3be9b93ecc57d91b0cb18ed81fc8a1ee (diff) | |
Merge tag 'efi-2021-10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-10-rc1
Documentation
* fix typo in signature.txt
UEFI
* provide file attributes in EFI_FILE_PROTOCOL.Read()
* various capsule update fixes
Diffstat (limited to 'lib/date.c')
| -rw-r--r-- | lib/date.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/date.c b/lib/date.c index 0456de78ab1..c589d9ed3a2 100644 --- a/lib/date.c +++ b/lib/date.c @@ -10,8 +10,6 @@ #include <rtc.h> #include <linux/time.h> -#if defined(CONFIG_LIB_DATE) || defined(CONFIG_TIMESTAMP) - #define FEBRUARY 2 #define STARTOFTIME 1970 #define SECDAY 86400L @@ -97,9 +95,6 @@ unsigned long rtc_mktime(const struct rtc_time *tm) return (hours * 60 + tm->tm_min) * 60 + tm->tm_sec; } -#endif /* CONFIG_LIB_DATE || CONFIG_TIMESTAMP */ - -#ifdef CONFIG_LIB_DATE /* for compatibility with linux code */ time64_t mktime64(const unsigned int year, const unsigned int mon, const unsigned int day, const unsigned int hour, @@ -116,4 +111,3 @@ time64_t mktime64(const unsigned int year, const unsigned int mon, return (time64_t)rtc_mktime((const struct rtc_time *)&time); } -#endif |