| Message ID | 20191108013215.28414-1-takahiro.akashi@linaro.org |
|---|---|
| State | Accepted |
| Commit | fefff636337b53ac7fc1b0e9f38eb7b188bc0e60 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] cmd: move down CONFIG_CMD_BOOTEFI after CONFIG_BOOTM_VXWORKS | expand |
On 11/8/19 2:32 AM, AKASHI Takahiro wrote: > Due to the commit 4b0bcfa7c4ec ("Kconfig: Migrate CONFIG_BOOTM_* options") > BOOTEFI and BOOTEFI_HELLO_COMPILE (and other BOOTEFI configs) are > displayed in a long distance. This will make it difficult for us to > understand that those configurations are closely related. > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> This is what the change looks like: == BEFORE == [*] bootm [ ] bootz -*- booti [*] bootefi [*] Support booting Linux OS images [*] Support booting NetBSD (non-EFI) loader images [ ] Support booting OPENRTOS / FreeRTOS images [ ] Support booting Enea OSE images [*] Support booting Plan9 OS images [*] Support booting RTEMS OS images [*] Support booting VxWorks OS images [*] Compile a standard EFI hello world binary for testing [ ] Allow booting a standard EFI hello world for testing [*] UEFI unit tests [ ] bootmenu == AFTER == [*] bootm [ ] bootz -*- booti [*] Support booting Linux OS images [*] Support booting NetBSD (non-EFI) loader images [ ] Support booting OPENRTOS / FreeRTOS images [ ] Support booting Enea OSE images [*] Support booting Plan9 OS images [*] Support booting RTEMS OS images [*] Support booting VxWorks OS images [*] bootefi [*] Compile a standard EFI hello world binary for testing [ ] Allow booting a standard EFI hello world for testing [*] UEFI unit tests [ ] bootmenu Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > cmd/Kconfig | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index 395dedd34d00..d9bc1eb8bd2b 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -263,13 +263,6 @@ config CMD_BOOTI > help > Boot an AArch64 Linux Kernel image from memory. > > -config CMD_BOOTEFI > - bool "bootefi" > - depends on EFI_LOADER > - default y > - help > - Boot an EFI image from memory. > - > config BOOTM_LINUX > bool "Support booting Linux OS images" > depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI > @@ -318,6 +311,13 @@ config BOOTM_VXWORKS > help > Support booting VxWorks images via the bootm command. > > +config CMD_BOOTEFI > + bool "bootefi" > + depends on EFI_LOADER > + default y > + help > + Boot an EFI image from memory. > + > config CMD_BOOTEFI_HELLO_COMPILE > bool "Compile a standard EFI hello world binary for testing" > depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX >
On Fri, Nov 08, 2019 at 07:56:50AM +0100, Heinrich Schuchardt wrote: > On 11/8/19 2:32 AM, AKASHI Takahiro wrote: > > Due to the commit 4b0bcfa7c4ec ("Kconfig: Migrate CONFIG_BOOTM_* options") > > BOOTEFI and BOOTEFI_HELLO_COMPILE (and other BOOTEFI configs) are > > displayed in a long distance. This will make it difficult for us to > > understand that those configurations are closely related. > > > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > > This is what the change looks like: > > == BEFORE == > > [*] bootm > [ ] bootz > -*- booti > [*] bootefi > [*] Support booting Linux OS images > [*] Support booting NetBSD (non-EFI) loader images > [ ] Support booting OPENRTOS / FreeRTOS images > [ ] Support booting Enea OSE images > [*] Support booting Plan9 OS images > [*] Support booting RTEMS OS images > [*] Support booting VxWorks OS images > [*] Compile a standard EFI hello world binary for testing > [ ] Allow booting a standard EFI hello world for testing > [*] UEFI unit tests > [ ] bootmenu > > == AFTER == > > [*] bootm > [ ] bootz > -*- booti > [*] Support booting Linux OS images > [*] Support booting NetBSD (non-EFI) loader images > [ ] Support booting OPENRTOS / FreeRTOS images > [ ] Support booting Enea OSE images > [*] Support booting Plan9 OS images > [*] Support booting RTEMS OS images > [*] Support booting VxWorks OS images > [*] bootefi > [*] Compile a standard EFI hello world binary for testing > [ ] Allow booting a standard EFI hello world for testing > [*] UEFI unit tests > [ ] bootmenu > > Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Oops, I got things off by an entry, thanks for fixing this. Reviewed-by: Tom Rini <trini@konsulko.com>
On Fri, Nov 08, 2019 at 10:32:15AM +0900, AKASHI Takahiro wrote: > Due to the commit 4b0bcfa7c4ec ("Kconfig: Migrate CONFIG_BOOTM_* options") > BOOTEFI and BOOTEFI_HELLO_COMPILE (and other BOOTEFI configs) are > displayed in a long distance. This will make it difficult for us to > understand that those configurations are closely related. > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/cmd/Kconfig b/cmd/Kconfig index 395dedd34d00..d9bc1eb8bd2b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -263,13 +263,6 @@ config CMD_BOOTI help Boot an AArch64 Linux Kernel image from memory. -config CMD_BOOTEFI - bool "bootefi" - depends on EFI_LOADER - default y - help - Boot an EFI image from memory. - config BOOTM_LINUX bool "Support booting Linux OS images" depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI @@ -318,6 +311,13 @@ config BOOTM_VXWORKS help Support booting VxWorks images via the bootm command. +config CMD_BOOTEFI + bool "bootefi" + depends on EFI_LOADER + default y + help + Boot an EFI image from memory. + config CMD_BOOTEFI_HELLO_COMPILE bool "Compile a standard EFI hello world binary for testing" depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX
Due to the commit 4b0bcfa7c4ec ("Kconfig: Migrate CONFIG_BOOTM_* options") BOOTEFI and BOOTEFI_HELLO_COMPILE (and other BOOTEFI configs) are displayed in a long distance. This will make it difficult for us to understand that those configurations are closely related. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- cmd/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)