| Message ID | 1528637118-32739-18-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: efi: Fixes and enhancements to application and payload support | expand |
On 10 June 2018 at 05:25, Bin Meng <bmeng.cn@gmail.com> wrote: > To avoid confusion, let's rename the efi-x86 target to efi-x86_app. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/cpu/efi/Makefile | 2 +- > arch/x86/cpu/efi/{efi.c => app.c} | 0 > arch/x86/cpu/intel_common/Makefile | 2 +- > arch/x86/dts/Makefile | 2 +- > arch/x86/dts/{efi.dts => efi-x86_app.dts} | 4 ++-- > board/efi/Kconfig | 6 +++--- > board/efi/{efi-x86 => efi-x86_app}/Kconfig | 6 +++--- > board/efi/{efi-x86 => efi-x86_app}/MAINTAINERS | 0 > board/efi/{efi-x86 => efi-x86_app}/Makefile | 2 +- > board/efi/{efi-x86/efi.c => efi-x86_app/app.c} | 0 > configs/{efi-x86_defconfig => efi-x86_app_defconfig} | 4 ++-- > include/configs/{efi-x86.h => efi-x86_app.h} | 0 > 12 files changed, 14 insertions(+), 14 deletions(-) > rename arch/x86/cpu/efi/{efi.c => app.c} (100%) > rename arch/x86/dts/{efi.dts => efi-x86_app.dts} (82%) > rename board/efi/{efi-x86 => efi-x86_app}/Kconfig (64%) > rename board/efi/{efi-x86 => efi-x86_app}/MAINTAINERS (100%) > rename board/efi/{efi-x86 => efi-x86_app}/Makefile (82%) > rename board/efi/{efi-x86/efi.c => efi-x86_app/app.c} (100%) > rename configs/{efi-x86_defconfig => efi-x86_app_defconfig} (92%) > rename include/configs/{efi-x86.h => efi-x86_app.h} (100%) > Reviewed-by: Simon Glass <sjg@chromium.org> Is a docs update needed too?
Hi Simon, On Mon, Jun 11, 2018 at 10:54 PM, Simon Glass <sjg@chromium.org> wrote: > On 10 June 2018 at 05:25, Bin Meng <bmeng.cn@gmail.com> wrote: >> To avoid confusion, let's rename the efi-x86 target to efi-x86_app. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/cpu/efi/Makefile | 2 +- >> arch/x86/cpu/efi/{efi.c => app.c} | 0 >> arch/x86/cpu/intel_common/Makefile | 2 +- >> arch/x86/dts/Makefile | 2 +- >> arch/x86/dts/{efi.dts => efi-x86_app.dts} | 4 ++-- >> board/efi/Kconfig | 6 +++--- >> board/efi/{efi-x86 => efi-x86_app}/Kconfig | 6 +++--- >> board/efi/{efi-x86 => efi-x86_app}/MAINTAINERS | 0 >> board/efi/{efi-x86 => efi-x86_app}/Makefile | 2 +- >> board/efi/{efi-x86/efi.c => efi-x86_app/app.c} | 0 >> configs/{efi-x86_defconfig => efi-x86_app_defconfig} | 4 ++-- >> include/configs/{efi-x86.h => efi-x86_app.h} | 0 >> 12 files changed, 14 insertions(+), 14 deletions(-) >> rename arch/x86/cpu/efi/{efi.c => app.c} (100%) >> rename arch/x86/dts/{efi.dts => efi-x86_app.dts} (82%) >> rename board/efi/{efi-x86 => efi-x86_app}/Kconfig (64%) >> rename board/efi/{efi-x86 => efi-x86_app}/MAINTAINERS (100%) >> rename board/efi/{efi-x86 => efi-x86_app}/Makefile (82%) >> rename board/efi/{efi-x86/efi.c => efi-x86_app/app.c} (100%) >> rename configs/{efi-x86_defconfig => efi-x86_app_defconfig} (92%) >> rename include/configs/{efi-x86.h => efi-x86_app.h} (100%) >> > > Reviewed-by: Simon Glass <sjg@chromium.org> > > Is a docs update needed too? Yes, will send v2 to include doc update. Regards, Bin
diff --git a/arch/x86/cpu/efi/Makefile b/arch/x86/cpu/efi/Makefile index 32c2dde..9716a4e 100644 --- a/arch/x86/cpu/efi/Makefile +++ b/arch/x86/cpu/efi/Makefile @@ -3,7 +3,7 @@ # Copyright (c) 2015 Google, Inc ifdef CONFIG_EFI_APP -obj-y += efi.o +obj-y += app.o obj-y += sdram.o endif diff --git a/arch/x86/cpu/efi/efi.c b/arch/x86/cpu/efi/app.c similarity index 100% rename from arch/x86/cpu/efi/efi.c rename to arch/x86/cpu/efi/app.c diff --git a/arch/x86/cpu/intel_common/Makefile b/arch/x86/cpu/intel_common/Makefile index c0fcf0c..bf798c2 100644 --- a/arch/x86/cpu/intel_common/Makefile +++ b/arch/x86/cpu/intel_common/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += mrc.o endif obj-y += cpu.o obj-y += lpc.o -ifndef CONFIG_TARGET_EFI +ifndef CONFIG_TARGET_EFI_APP obj-y += microcode.o endif obj-y += pch.o diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index 9872c04..37e4fdc 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -10,7 +10,7 @@ dtb-y += bayleybay.dtb \ crownbay.dtb \ dfi-bt700-q7x-151.dtb \ edison.dtb \ - efi.dtb \ + efi-x86_app.dtb \ efi-x86_payload.dtb \ galileo.dtb \ minnowmax.dtb \ diff --git a/arch/x86/dts/efi.dts b/arch/x86/dts/efi-x86_app.dts similarity index 82% rename from arch/x86/dts/efi.dts rename to arch/x86/dts/efi-x86_app.dts index 62ae96a..e70e351 100644 --- a/arch/x86/dts/efi.dts +++ b/arch/x86/dts/efi-x86_app.dts @@ -9,8 +9,8 @@ /include/ "tsc_timer.dtsi" / { - model = "EFI"; - compatible = "efi,app"; + model = "EFI x86 Application"; + compatible = "efi,x86-app"; chosen { stdout-path = &serial; diff --git a/board/efi/Kconfig b/board/efi/Kconfig index d37f6ff..291bd2c 100644 --- a/board/efi/Kconfig +++ b/board/efi/Kconfig @@ -4,8 +4,8 @@ choice prompt "Mainboard model" optional -config TARGET_EFI - bool "efi" +config TARGET_EFI_APP + bool "efi application" help This target is used for running U-Boot on top of EFI. In this case EFI does the early initialisation, and U-Boot @@ -22,7 +22,7 @@ config TARGET_EFI_PAYLOAD endchoice -source "board/efi/efi-x86/Kconfig" +source "board/efi/efi-x86_app/Kconfig" source "board/efi/efi-x86_payload/Kconfig" endif diff --git a/board/efi/efi-x86/Kconfig b/board/efi/efi-x86_app/Kconfig similarity index 64% rename from board/efi/efi-x86/Kconfig rename to board/efi/efi-x86_app/Kconfig index fa609ba..ae87bf3 100644 --- a/board/efi/efi-x86/Kconfig +++ b/board/efi/efi-x86_app/Kconfig @@ -1,7 +1,7 @@ -if TARGET_EFI +if TARGET_EFI_APP config SYS_BOARD - default "efi-x86" + default "efi-x86_app" config SYS_VENDOR default "efi" @@ -10,6 +10,6 @@ config SYS_SOC default "efi" config SYS_CONFIG_NAME - default "efi-x86" + default "efi-x86_app" endif diff --git a/board/efi/efi-x86/MAINTAINERS b/board/efi/efi-x86_app/MAINTAINERS similarity index 100% rename from board/efi/efi-x86/MAINTAINERS rename to board/efi/efi-x86_app/MAINTAINERS diff --git a/board/efi/efi-x86/Makefile b/board/efi/efi-x86_app/Makefile similarity index 82% rename from board/efi/efi-x86/Makefile rename to board/efi/efi-x86_app/Makefile index 2097283..cb48d1c 100644 --- a/board/efi/efi-x86/Makefile +++ b/board/efi/efi-x86_app/Makefile @@ -2,4 +2,4 @@ # # Copyright (c) 2015 Google, Inc -obj-y += efi.o +obj-y += app.o diff --git a/board/efi/efi-x86/efi.c b/board/efi/efi-x86_app/app.c similarity index 100% rename from board/efi/efi-x86/efi.c rename to board/efi/efi-x86_app/app.c diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_app_defconfig similarity index 92% rename from configs/efi-x86_defconfig rename to configs/efi-x86_app_defconfig index 741a169..4088dae 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_app_defconfig @@ -1,7 +1,7 @@ CONFIG_X86=y CONFIG_VENDOR_EFI=y -CONFIG_DEFAULT_DEVICE_TREE="efi" -CONFIG_TARGET_EFI=y +CONFIG_DEFAULT_DEVICE_TREE="efi-x86_app" +CONFIG_TARGET_EFI_APP=y CONFIG_DEBUG_UART=y CONFIG_FIT=y CONFIG_USE_BOOTARGS=y diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86_app.h similarity index 100% rename from include/configs/efi-x86.h rename to include/configs/efi-x86_app.h
To avoid confusion, let's rename the efi-x86 target to efi-x86_app. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/cpu/efi/Makefile | 2 +- arch/x86/cpu/efi/{efi.c => app.c} | 0 arch/x86/cpu/intel_common/Makefile | 2 +- arch/x86/dts/Makefile | 2 +- arch/x86/dts/{efi.dts => efi-x86_app.dts} | 4 ++-- board/efi/Kconfig | 6 +++--- board/efi/{efi-x86 => efi-x86_app}/Kconfig | 6 +++--- board/efi/{efi-x86 => efi-x86_app}/MAINTAINERS | 0 board/efi/{efi-x86 => efi-x86_app}/Makefile | 2 +- board/efi/{efi-x86/efi.c => efi-x86_app/app.c} | 0 configs/{efi-x86_defconfig => efi-x86_app_defconfig} | 4 ++-- include/configs/{efi-x86.h => efi-x86_app.h} | 0 12 files changed, 14 insertions(+), 14 deletions(-) rename arch/x86/cpu/efi/{efi.c => app.c} (100%) rename arch/x86/dts/{efi.dts => efi-x86_app.dts} (82%) rename board/efi/{efi-x86 => efi-x86_app}/Kconfig (64%) rename board/efi/{efi-x86 => efi-x86_app}/MAINTAINERS (100%) rename board/efi/{efi-x86 => efi-x86_app}/Makefile (82%) rename board/efi/{efi-x86/efi.c => efi-x86_app/app.c} (100%) rename configs/{efi-x86_defconfig => efi-x86_app_defconfig} (92%) rename include/configs/{efi-x86.h => efi-x86_app.h} (100%)