linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

efi_loader: Rename EFI_RUNTIME_{TEXT, DATA} to __efi_runtime{, _data}

Browse Source 
Compiler attributes are more commonly __foo style tags rather than big
upper case eye sores like EFI_RUNTIME_TEXT.

Simon Glass felt quite strongly about this, so this patch converts our
existing defines over to more eye friendly ones.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Alexander Graf
2016-10-14 13:45:30 +02:00
parent 65e4c0b168
commit 3c63db9ca9
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/efi_loader/efi_boottime.c
View File

@ -37,7 +37,7 @@ static bool efi_is_direct_boot = true;
* In most cases we want to pass an FDT to the payload, so reserve one slot of
* config table space for it. The pointer gets populated by do_bootefi_exec().
*/
static struct efi_configuration_table EFI_RUNTIME_DATA efi_conf_table[2];
static struct efi_configuration_table __efi_runtime_data efi_conf_table[2];
#ifdef CONFIG_ARM
/*
@ -790,10 +790,10 @@ static const struct efi_boot_services efi_boot_services = {
};
static uint16_t EFI_RUNTIME_DATA firmware_vendor[] =
static uint16_t __efi_runtime_data firmware_vendor[] =
{ 'D','a','s',' ','U','-','b','o','o','t',0 };
struct efi_system_table EFI_RUNTIME_DATA systab = {
struct efi_system_table __efi_runtime_data systab = {
.hdr = {
.signature = EFI_SYSTEM_TABLE_SIGNATURE,
.revision = 0x20005, /* 2.5 */

20
lib/efi_loader/efi_runtime.c
View File

@ -26,9 +26,9 @@ struct efi_runtime_mmio_list {
/* This list contains all runtime available mmio regions */
LIST_HEAD(efi_runtime_mmio);
static efi_status_t EFI_RUNTIME_TEXT EFIAPI efi_unimplemented(void);
static efi_status_t EFI_RUNTIME_TEXT EFIAPI efi_device_error(void);
static efi_status_t EFI_RUNTIME_TEXT EFIAPI efi_invalid_parameter(void);
static efi_status_t __efi_runtime EFIAPI efi_unimplemented(void);
static efi_status_t __efi_runtime EFIAPI efi_device_error(void);
static efi_status_t __efi_runtime EFIAPI efi_invalid_parameter(void);
#ifdef CONFIG_SYS_CACHELINE_SIZE
#define EFI_CACHELINE_SIZE CONFIG_SYS_CACHELINE_SIZE
@ -125,7 +125,7 @@ static efi_status_t EFIAPI efi_get_time_boottime(
/* Boards may override the helpers below to implement RTS functionality */
void __weak EFI_RUNTIME_TEXT EFIAPI efi_reset_system(
void __weak __efi_runtime EFIAPI efi_reset_system(
enum efi_reset_type reset_type,
efi_status_t reset_status,
unsigned long data_size, void *reset_data)
@ -138,7 +138,7 @@ void __weak efi_reset_system_init(void)
{
}
efi_status_t __weak EFI_RUNTIME_TEXT EFIAPI efi_get_time(
efi_status_t __weak __efi_runtime EFIAPI efi_get_time(
struct efi_time *time,
struct efi_time_cap *capabilities)
{
@ -346,7 +346,7 @@ void efi_add_runtime_mmio(void *mmio_ptr, u64 len)
* function or variable below this line.
*
* Please keep everything fully self-contained and annotated with
* EFI_RUNTIME_TEXT and EFI_RUNTIME_DATA markers.
* __efi_runtime and __efi_runtime_data markers.
*/
/*
@ -355,22 +355,22 @@ void efi_add_runtime_mmio(void *mmio_ptr, u64 len)
* address map calls.
*/
static efi_status_t EFI_RUNTIME_TEXT EFIAPI efi_unimplemented(void)
static efi_status_t __efi_runtime EFIAPI efi_unimplemented(void)
{
return EFI_UNSUPPORTED;
}
static efi_status_t EFI_RUNTIME_TEXT EFIAPI efi_device_error(void)
static efi_status_t __efi_runtime EFIAPI efi_device_error(void)
{
return EFI_DEVICE_ERROR;
}
static efi_status_t EFI_RUNTIME_TEXT EFIAPI efi_invalid_parameter(void)
static efi_status_t __efi_runtime EFIAPI efi_invalid_parameter(void)
{
return EFI_INVALID_PARAMETER;
}
struct efi_runtime_services EFI_RUNTIME_DATA efi_runtime_services = {
struct efi_runtime_services __efi_runtime_data efi_runtime_services = {
.hdr = {
.signature = EFI_RUNTIME_SERVICES_SIGNATURE,
.revision = EFI_RUNTIME_SERVICES_REVISION,