Message ID | 1437580180-6405-32-git-send-email-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show |
Hi Simon, On Wed, Jul 22, 2015 at 11:49 PM, Simon Glass <sjg@chromium.org> wrote: > From: Ben Stoltz <stoltz@google.com> > > Add configuration and Kconfig changes for this board. > > Signed-off-by: Ben Stoltz <stoltz@google.com> > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > configs/efi-x86_defconfig | 16 ++++++++++++++++ > include/configs/efi-x86.h | 37 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 53 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..f07305c > --- /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 I don't think DM_CPI works.. > +CONFIG_DEFAULT_DEVICE_TREE="efi" > +CONFIG_EFI=y > +CONFIG_ARCH_EFI=y > +CONFIG_DEBUG_UART=y > +CONFIG_DEBUG_UART_EFI=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..9ffc2ea > --- /dev/null > +++ b/include/configs/efi-x86.h > @@ -0,0 +1,37 @@ > +/* > + * 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 > + > +#define CONFIG_SYS_EARLY_PCI_INIT > +#define CONFIG_PCI_PNP > + I guess these two should be turned off for now as pci is not supported. > +#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
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig new file mode 100644 index 0000000..f07305c --- /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 +CONFIG_DEFAULT_DEVICE_TREE="efi" +CONFIG_EFI=y +CONFIG_ARCH_EFI=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_EFI=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..9ffc2ea --- /dev/null +++ b/include/configs/efi-x86.h @@ -0,0 +1,37 @@ +/* + * 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 + +#define CONFIG_SYS_EARLY_PCI_INIT +#define CONFIG_PCI_PNP + +#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