[U-Boot] [PATCH v2 3/9] x86: Re-order efi-x86_defconfig

[Simon Glass]

Hi Bin,

On 10 August 2015 at 22:03, Bin Meng <bmeng.cn at gmail.com> wrote:
> Hi Simon,
>
> On Tue, Aug 11, 2015 at 11:55 AM, Simon Glass <sjg at chromium.org> wrote:
>> Hi Bin,
>>
>> On 10 August 2015 at 21:53, Bin Meng <bmeng.cn at gmail.com> wrote:
>>> Hi Simon,
>>>
>>> On Mon, Aug 10, 2015 at 8:58 PM, Simon Glass <sjg at chromium.org> wrote:
>>>> Hi Bin,
>>>>
>>>> On 10 August 2015 at 00:18, Bin Meng <bmeng.cn at gmail.com> wrote:
>>>>> Hi Simon,
>>>>>
>>>>> On Sat, Aug 8, 2015 at 10:26 PM, Simon Glass <sjg at chromium.org> wrote:
>>>>>> Use savedefconfig to get this file into the correct order.
>>>>>>
>>>>>> Signed-off-by: Simon Glass <sjg at chromium.org>
>>>>>> ---
>>>>>>
>>>>>> 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
>>>>>
>>>>> I ran 'savedefconfig' but did not see this line was added. Could you
>>>>> please double check?
>>>>>
>>>>>> +CONFIG_EFI=y
>>>>>> --
>>>>
>>>> I'm building it, then 'make O=b/efi-x86 savedefconfig', then comparing
>>>> b/efi-x86/defconfig against configs/efi-x86_defconfig. It does have
>>>> CONFIG_EFI in it when I do this. Without that we wouldn't have some of
>>>> the EFI features.
>>>
>>> Sorry I wasn't clear. I mean this line:
>>>
>>> +# CONFIG_X86_SERIAL is not set
>>>
>>> I don't see this line in other x86 board defconfig too. Could you
>>> please recheck?
>>
>> The others do in fact use this driver. Only the EFI App does not - it
>> must go through EFI to use the console.
>
> OK, so 'make savedefconfig' does not add this line for us. It was
> added by you manually, right? I wonder why 'make savedefconfig' does
> not do this for us, like I see it indeed adds "# CONFIG_CMD_BOOTM is
> not set" for us.

No.

CONFIG_X86_SERIAL is the default for x86, so we have to turn it off
for EFI to not include it.

Regards,
Simon