| Message ID | 1439211912-10085-4-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On Mon, Aug 10, 2015 at 9:05 PM, Simon Glass <sjg@chromium.org> wrote: > Use savedefconfig to get this file into the correct order. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v3: None > Changes in v2: > - Rebase to mainline > > configs/efi-x86_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig > index 1aa0655..43fb0c4 100644 > --- a/configs/efi-x86_defconfig > +++ b/configs/efi-x86_defconfig > @@ -1,16 +1,16 @@ > CONFIG_X86=y > CONFIG_VENDOR_EFI=y > +CONFIG_DEFAULT_DEVICE_TREE="efi" > CONFIG_TARGET_EFI=y > CONFIG_TSC_CALIBRATION_BYPASS=y > +# CONFIG_CMD_BOOTM is not set > +# CONFIG_CMD_NET is not set > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > CONFIG_DM_PCI=y > -CONFIG_DEFAULT_DEVICE_TREE="efi" > -CONFIG_EFI=y > -CONFIG_EFI_APP=y > CONFIG_DEBUG_UART=y > CONFIG_DEBUG_EFI_CONSOLE=y > CONFIG_DEBUG_UART_BASE=0 > CONFIG_DEBUG_UART_CLOCK=0 > -# CONFIG_CMD_NET is not set > -# CONFIG_CMD_BOOTM is not set > +# CONFIG_X86_SERIAL is not set > +CONFIG_EFI=y > -- Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On 10 August 2015 at 22:54, Bin Meng <bmeng.cn@gmail.com> wrote: > On Mon, Aug 10, 2015 at 9:05 PM, Simon Glass <sjg@chromium.org> wrote: >> Use savedefconfig to get this file into the correct order. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> >> --- >> >> Changes in v3: None >> Changes in v2: >> - Rebase to mainline >> >> configs/efi-x86_defconfig | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig >> index 1aa0655..43fb0c4 100644 >> --- a/configs/efi-x86_defconfig >> +++ b/configs/efi-x86_defconfig >> @@ -1,16 +1,16 @@ >> CONFIG_X86=y >> CONFIG_VENDOR_EFI=y >> +CONFIG_DEFAULT_DEVICE_TREE="efi" >> CONFIG_TARGET_EFI=y >> CONFIG_TSC_CALIBRATION_BYPASS=y >> +# CONFIG_CMD_BOOTM is not set >> +# CONFIG_CMD_NET is not set >> CONFIG_OF_CONTROL=y >> CONFIG_OF_EMBED=y >> CONFIG_DM_PCI=y >> -CONFIG_DEFAULT_DEVICE_TREE="efi" >> -CONFIG_EFI=y >> -CONFIG_EFI_APP=y >> CONFIG_DEBUG_UART=y >> CONFIG_DEBUG_EFI_CONSOLE=y >> CONFIG_DEBUG_UART_BASE=0 >> CONFIG_DEBUG_UART_CLOCK=0 >> -# CONFIG_CMD_NET is not set >> -# CONFIG_CMD_BOOTM is not set >> +# CONFIG_X86_SERIAL is not set >> +CONFIG_EFI=y >> -- > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Applied to u-boot-x86
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index 1aa0655..43fb0c4 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -1,16 +1,16 @@ CONFIG_X86=y CONFIG_VENDOR_EFI=y +CONFIG_DEFAULT_DEVICE_TREE="efi" CONFIG_TARGET_EFI=y CONFIG_TSC_CALIBRATION_BYPASS=y +# CONFIG_CMD_BOOTM is not set +# CONFIG_CMD_NET is not set CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_DM_PCI=y -CONFIG_DEFAULT_DEVICE_TREE="efi" -CONFIG_EFI=y -CONFIG_EFI_APP=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_EFI_CONSOLE=y CONFIG_DEBUG_UART_BASE=0 CONFIG_DEBUG_UART_CLOCK=0 -# CONFIG_CMD_NET is not set -# CONFIG_CMD_BOOTM is not set +# CONFIG_X86_SERIAL is not set +CONFIG_EFI=y
Use savedefconfig to get this file into the correct order. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v3: None Changes in v2: - Rebase to mainline configs/efi-x86_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)