[U-Boot] [PATCH v2 32/47] x86: Add definitions for the x86-efi board and plumb it in

[Simon Glass]

Hi Bin,

On 3 August 2015 at 23:20, Bin Meng <bmeng.cn at gmail.com> wrote:
> Hi Simon,
>
> On Fri, Jul 31, 2015 at 11:31 PM, Simon Glass <sjg at chromium.org> wrote:
>> From: Ben Stoltz <stoltz at google.com>
>>
>> Add configuration and Kconfig changes for this board.
>>
>> Signed-off-by: Ben Stoltz <stoltz at google.com>
>> Signed-off-by: Simon Glass <sjg at chromium.org>
>> ---
>>
>
> Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
>
> But please see comments/nits below.
>
>
>> Changes in v2:
>> - Remove CONFIG_SYS_EARLY_PCI_INIT and CONFIG_PCI_PNP
>> - Remove superfluous Kconfig options
>> - Rename CONFIG_ARCH_EFI to CONFIG_EFI_APP
>> - Rename CONFIG_DEBUG_UART_EFI to CONFIG_DEBUG_EFI_CONSOLE
>>
>>  configs/efi-x86_defconfig | 16 ++++++++++++++++
>>  include/configs/efi-x86.h | 34 ++++++++++++++++++++++++++++++++++
>>  2 files changed, 50 insertions(+)
>>  create mode 100644 configs/efi-x86_defconfig
>>  create mode 100644 include/configs/efi-x86.h
>>
>> diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
>> new file mode 100644
>> index 0000000..1aa0655
>> --- /dev/null
>> +++ b/configs/efi-x86_defconfig
>> @@ -0,0 +1,16 @@
>> +CONFIG_X86=y
>> +CONFIG_VENDOR_EFI=y
>> +CONFIG_TARGET_EFI=y
>> +CONFIG_TSC_CALIBRATION_BYPASS=y
>> +CONFIG_OF_CONTROL=y
>> +CONFIG_OF_EMBED=y
>> +CONFIG_DM_PCI=y
>
> Can we remove this DM_PCI too? I don't think it works.

Unfortunately not, it breaks the app (it actually crashes the
emulator). I'm not really sure why but I suspect that some x86 code
requires it at present.

>
>> +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
>> diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
>> new file mode 100644
>> index 0000000..5779cfd
>> --- /dev/null
>> +++ b/include/configs/efi-x86.h
>> @@ -0,0 +1,34 @@
>> +/*
>> + * Copyright (c) 2015 Google, Inc
>> + *
>> + * SPDX-License-Identifier:    GPL-2.0+
>> + */
>> +
>> +#ifndef __CONFIG_H
>> +#define __CONFIG_H
>> +
>> +#include <configs/x86-common.h>
>> +
>> +#undef CONFIG_CMD_SF_TEST
>> +
>> +#undef CONFIG_TPM
>> +#undef CONFIG_TPM_TIS_LPC
>> +#undef CONFIG_TPM_TIS_BASE_ADDRESS
>> +
>> +#undef CONFIG_CMD_IMLS
>> +
>> +#undef CONFIG_SYS_NS16550
>> +#undef CONFIG_X86_SERIAL
>> +#undef CONFIG_ENV_IS_IN_SPI_FLASH
>> +#define CONFIG_ENV_IS_NOWHERE
>> +#undef CONFIG_VIDEO
>> +#undef CONFIG_CFB_CONSOLE
>> +#undef CONFIG_SCSI_AHCI
>> +#undef CONFIG_CMD_SCSI
>> +#undef CONFIG_INTEL_ICH6_GPIO
>> +
>> +#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
>> +                                       "stdout=vga,serial\0" \
>> +                                       "stderr=vga,serial\0"
>> +
>> +#endif
>> --
>
> Regards,
> Bin

Regards,
Simon