efi_loader: Kconfig entries for GetTime(), SetTime()

The GetTime() and the SetTime() runtime services are not obligatory. So
let's make them customizable.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-05-31 22:56:02 +02:00
parent 38b9a79c63
commit 5ec48e38ee
4 changed files with 26 additions and 15 deletions

View File

@ -18,6 +18,22 @@ config EFI_LOADER
if EFI_LOADER if EFI_LOADER
config EFI_GET_TIME
bool "GetTime() runtime service"
depends on DM_RTC
default y
help
Provide the GetTime() runtime service at boottime. This service
can be used by an EFI application to read the real time clock.
config EFI_SET_TIME
bool "SetTime() runtime service"
depends on EFI_GET_TIME
default n
help
Provide the SetTime() runtime service at boottime. This service
can be used by an EFI application to adjust the real time clock.
config EFI_DEVICE_PATH_TO_TEXT config EFI_DEVICE_PATH_TO_TEXT
bool "Device path to text protocol" bool "Device path to text protocol"
default y default y

View File

@ -167,7 +167,7 @@ static efi_status_t EFIAPI efi_get_time_boottime(
struct efi_time *time, struct efi_time *time,
struct efi_time_cap *capabilities) struct efi_time_cap *capabilities)
{ {
#ifdef CONFIG_DM_RTC #ifdef CONFIG_EFI_GET_TIME
efi_status_t ret = EFI_SUCCESS; efi_status_t ret = EFI_SUCCESS;
struct rtc_time tm; struct rtc_time tm;
struct udevice *dev; struct udevice *dev;
@ -214,7 +214,7 @@ out:
#endif #endif
} }
#ifdef CONFIG_DM_RTC #ifdef CONFIG_EFI_SET_TIME
/** /**
* efi_validate_time() - checks if timestamp is valid * efi_validate_time() - checks if timestamp is valid
@ -252,7 +252,7 @@ static int efi_validate_time(struct efi_time *time)
*/ */
static efi_status_t EFIAPI efi_set_time_boottime(struct efi_time *time) static efi_status_t EFIAPI efi_set_time_boottime(struct efi_time *time)
{ {
#ifdef CONFIG_DM_RTC #ifdef CONFIG_EFI_SET_TIME
efi_status_t ret = EFI_SUCCESS; efi_status_t ret = EFI_SUCCESS;
struct rtc_time tm; struct rtc_time tm;
struct udevice *dev; struct udevice *dev;

View File

@ -27,7 +27,6 @@ efi_selftest_loaded_image.o \
efi_selftest_manageprotocols.o \ efi_selftest_manageprotocols.o \
efi_selftest_memory.o \ efi_selftest_memory.o \
efi_selftest_register_notify.o \ efi_selftest_register_notify.o \
efi_selftest_rtc.o \
efi_selftest_snp.o \ efi_selftest_snp.o \
efi_selftest_textinput.o \ efi_selftest_textinput.o \
efi_selftest_textinputex.o \ efi_selftest_textinputex.o \
@ -43,6 +42,7 @@ efi_selftest_unicode_collation.o
obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o
obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o
obj-$(CONFIG_EFI_GET_TIME) += efi_selftest_rtc.o
ifeq ($(CONFIG_GENERATE_ACPI_TABLE),) ifeq ($(CONFIG_GENERATE_ACPI_TABLE),)
obj-y += efi_selftest_fdt.o obj-y += efi_selftest_fdt.o

View File

@ -40,7 +40,9 @@ static int setup(const efi_handle_t handle,
static int execute(void) static int execute(void)
{ {
efi_status_t ret; efi_status_t ret;
struct efi_time tm, tm_old, tm_new = { struct efi_time tm_old;
#ifdef CONFIG_EFI_SET_TIME
struct efi_time tm, tm_new = {
.year = 2017, .year = 2017,
.month = 5, .month = 5,
.day = 19, .day = 19,
@ -48,31 +50,23 @@ static int execute(void)
.minute = 47, .minute = 47,
.second = 53, .second = 53,
}; };
#endif
/* Display current time */ /* Display current time */
ret = runtime->get_time(&tm_old, NULL); ret = runtime->get_time(&tm_old, NULL);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
#ifdef CONFIG_CMD_DATE
efi_st_error(EFI_ST_NO_RTC); efi_st_error(EFI_ST_NO_RTC);
return EFI_ST_FAILURE; return EFI_ST_FAILURE;
#else
efi_st_todo(EFI_ST_NO_RTC);
return EFI_ST_SUCCESS;
#endif
} }
efi_st_printf("Time according to real time clock: " efi_st_printf("Time according to real time clock: "
"%.4u-%.2u-%.2u %.2u:%.2u:%.2u\n", "%.4u-%.2u-%.2u %.2u:%.2u:%.2u\n",
tm_old.year, tm_old.month, tm_old.day, tm_old.year, tm_old.month, tm_old.day,
tm_old.hour, tm_old.minute, tm_old.second); tm_old.hour, tm_old.minute, tm_old.second);
#ifdef CONFIG_EFI_SET_TIME
ret = runtime->set_time(&tm_new); ret = runtime->set_time(&tm_new);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
#ifdef CONFIG_CMD_DATE
efi_st_error(EFI_ST_NO_RTC_SET); efi_st_error(EFI_ST_NO_RTC_SET);
return EFI_ST_FAILURE; return EFI_ST_FAILURE;
#else
efi_st_todo(EFI_ST_NO_RTC_SET);
return EFI_ST_SUCCESS;
#endif
} }
ret = runtime->get_time(&tm, NULL); ret = runtime->get_time(&tm, NULL);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
@ -95,6 +89,7 @@ static int execute(void)
efi_st_error(EFI_ST_NO_RTC_SET); efi_st_error(EFI_ST_NO_RTC_SET);
return EFI_ST_FAILURE; return EFI_ST_FAILURE;
} }
#endif
return EFI_ST_SUCCESS; return EFI_ST_SUCCESS;
} }