| Message ID | 20200812234758.3563-8-atish.patra@wdc.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Add UEFI support for RISC-V | expand |
On Thu, 13 Aug 2020 at 01:48, Atish Patra <atish.patra@wdc.com> wrote: > > arm-init is responsible for setting up efi runtime and doesn't actually > do any ARM specific stuff. RISC-V can use the same source code as it is. > > Rename it to efi-init so that RISC-V can use it. > > Signed-off-by: Atish Patra <atish.patra@wdc.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> Note to the maintainer: to the extent possible, please put the patches in this series that touch drivers/firmware/efi on a separate branch based on v5.9-rc1, and merge that into your for-v5.10 branch at the appropriate spot. I don't have anything queued in the EFI tree at the moment, and so these changes can happily go through the riscv tree, as long as I am not forced to merge a bunch of unrelated changes on the off chance that something does come up. > --- > drivers/firmware/efi/Makefile | 2 +- > drivers/firmware/efi/{arm-init.c => efi-init.c} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename drivers/firmware/efi/{arm-init.c => efi-init.c} (100%) > > diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile > index 7a216984552b..61fd1e8b26fb 100644 > --- a/drivers/firmware/efi/Makefile > +++ b/drivers/firmware/efi/Makefile > @@ -32,7 +32,7 @@ obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o > fake_map-y += fake_mem.o > fake_map-$(CONFIG_X86) += x86_fake_mem.o > > -arm-obj-$(CONFIG_EFI) := arm-init.o arm-runtime.o > +arm-obj-$(CONFIG_EFI) := efi-init.o arm-runtime.o > obj-$(CONFIG_ARM) += $(arm-obj-y) > obj-$(CONFIG_ARM64) += $(arm-obj-y) > obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o > diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/efi-init.c > similarity index 100% > rename from drivers/firmware/efi/arm-init.c > rename to drivers/firmware/efi/efi-init.c > -- > 2.24.0 >
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index 7a216984552b..61fd1e8b26fb 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -32,7 +32,7 @@ obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o fake_map-y += fake_mem.o fake_map-$(CONFIG_X86) += x86_fake_mem.o -arm-obj-$(CONFIG_EFI) := arm-init.o arm-runtime.o +arm-obj-$(CONFIG_EFI) := efi-init.o arm-runtime.o obj-$(CONFIG_ARM) += $(arm-obj-y) obj-$(CONFIG_ARM64) += $(arm-obj-y) obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/efi-init.c similarity index 100% rename from drivers/firmware/efi/arm-init.c rename to drivers/firmware/efi/efi-init.c
arm-init is responsible for setting up efi runtime and doesn't actually do any ARM specific stuff. RISC-V can use the same source code as it is. Rename it to efi-init so that RISC-V can use it. Signed-off-by: Atish Patra <atish.patra@wdc.com> --- drivers/firmware/efi/Makefile | 2 +- drivers/firmware/efi/{arm-init.c => efi-init.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/firmware/efi/{arm-init.c => efi-init.c} (100%)