diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-14 13:43:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-14 16:27:16 -0400 |
| commit | 632093b566569329bc6e5b0893bdca01de905314 (patch) | |
| tree | ddd8cb84789bf0bc60a566fd8d33ff138d6861e9 /configs | |
| parent | 61dfa65e405f2713dfc8090ed8147ec33b003717 (diff) | |
| parent | 236efe36be6d1c544f9477f10fdf38a17cd7a869 (diff) | |
| download | talos-obmc-uboot-632093b566569329bc6e5b0893bdca01de905314.tar.gz talos-obmc-uboot-632093b566569329bc6e5b0893bdca01de905314.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/efi-x86_defconfig | 10 | ||||
| -rw-r--r-- | configs/minnowmax_defconfig | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index 1aa0655a17..43fb0c45df 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 diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index a67597d8d6..f3cf91b94e 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -5,7 +5,8 @@ CONFIG_TARGET_MINNOWMAX=y CONFIG_HAVE_INTEL_ME=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y -CONFIG_GENERATE_SFI_TABLE=y +CONFIG_GENERATE_PIRQ_TABLE=y +CONFIG_GENERATE_MP_TABLE=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set @@ -18,13 +19,15 @@ CONFIG_OF_CONTROL=y CONFIG_CPU=y CONFIG_DM_PCI=y CONFIG_SPI_FLASH=y +CONFIG_DM_ETH=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0x3f8 +CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_DM_RTC=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_SYS_VSNPRINTF=y -CONFIG_DEBUG_UART=y -CONFIG_DEBUG_UART_NS16550=y -CONFIG_DEBUG_UART_BASE=0x3f8 -CONFIG_DEBUG_UART_CLOCK=1843200 |
